From 358f091189be271f95ca3595f537c5bc9f51036e Mon Sep 17 00:00:00 2001 From: Domenic Denicola Date: Fri, 6 Aug 2021 14:10:55 -0700 Subject: [PATCH] App history: rename navigateInfo to info Follows https://github.com/WICG/app-history/pull/145. Fixed: 1237539 Bug: 1183545 Change-Id: Icd18658516988346b570485cc9ad912b300df40f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/3078659 Commit-Queue: Domenic Denicola Commit-Queue: Nate Chapin Auto-Submit: Domenic Denicola Reviewed-by: Nate Chapin Cr-Commit-Position: refs/heads/master@{#909470} --- .../navigate-appHistory-back-cross-document.html | 2 +- .../navigate-appHistory-back-same-document.html | 2 +- app-history/navigate-event/navigate-within-onnavigate.html | 4 ++-- app-history/navigate/navigate-info-and-state.html | 2 +- app-history/navigate/navigate-without-url-arg-replace.html | 2 +- app-history/navigate/navigate-without-url-arg.html | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app-history/navigate-event/navigate-appHistory-back-cross-document.html b/app-history/navigate-event/navigate-appHistory-back-cross-document.html index 7ed5a589632db9..ae3db6f8628537 100644 --- a/app-history/navigate-event/navigate-appHistory-back-cross-document.html +++ b/app-history/navigate-event/navigate-appHistory-back-cross-document.html @@ -24,7 +24,7 @@ assert_equals(e.info, "hi"); }); assert_true(i.contentWindow.appHistory.canGoBack); - i.contentWindow.appHistory.back({ navigateInfo: "hi" }); + i.contentWindow.appHistory.back({ info: "hi" }); }) }); }, "navigate event for appHistory.back() - cross-document"); diff --git a/app-history/navigate-event/navigate-appHistory-back-same-document.html b/app-history/navigate-event/navigate-appHistory-back-same-document.html index 89f54a7e14cacf..e201e41f1ade7d 100644 --- a/app-history/navigate-event/navigate-appHistory-back-same-document.html +++ b/app-history/navigate-event/navigate-appHistory-back-same-document.html @@ -24,7 +24,7 @@ assert_equals(e.info, "hi"); }); assert_true(appHistory.canGoBack); - appHistory.back({ navigateInfo: "hi" }); + appHistory.back({ info: "hi" }); }); }, 0); }, "navigate event for appHistory.back() - same-document"); diff --git a/app-history/navigate-event/navigate-within-onnavigate.html b/app-history/navigate-event/navigate-within-onnavigate.html index b28b184cf3f7d8..5e2945a5eb4e6d 100644 --- a/app-history/navigate-event/navigate-within-onnavigate.html +++ b/app-history/navigate-event/navigate-within-onnavigate.html @@ -6,11 +6,11 @@ promise_test(async t => { appHistory.onnavigate = t.step_func(e => { if (e.info == 1) { - appHistory.navigate("#2", { navigateInfo: 2 }); + appHistory.navigate("#2", { info: 2 }); assert_true(e.defaultPrevented); } }); - await promise_rejects_dom(t, 'AbortError', appHistory.navigate("#1", { navigateInfo: 1 })); + await promise_rejects_dom(t, 'AbortError', appHistory.navigate("#1", { info: 1 })); assert_equals(location.hash, "#2"); }, "if navigate() is called inside onnavigate, the previous navigation and navigate event are cancelled"); diff --git a/app-history/navigate/navigate-info-and-state.html b/app-history/navigate/navigate-info-and-state.html index 394541fb1abdb8..d6b4f25e2f3ae9 100644 --- a/app-history/navigate/navigate-info-and-state.html +++ b/app-history/navigate/navigate-info-and-state.html @@ -10,7 +10,7 @@ onnavigated_called = true; assert_equals(e.info, navInfo) }); - await appHistory.navigate("#1", { navigateInfo: navInfo, state: navState }); + await appHistory.navigate("#1", { info: navInfo, state: navState }); assert_true(onnavigated_called); assert_not_equals(appHistory.current.getState(), navState); assert_equals(appHistory.current.getState().statevar, navState.statevar); diff --git a/app-history/navigate/navigate-without-url-arg-replace.html b/app-history/navigate/navigate-without-url-arg-replace.html index 081a29eac706c2..482402f3fa0783 100644 --- a/app-history/navigate/navigate-without-url-arg-replace.html +++ b/app-history/navigate/navigate-without-url-arg-replace.html @@ -13,7 +13,7 @@ onnavigate_called = true; assert_equals(e.info, navInfo); }); - i.contentWindow.appHistory.navigate({ replace: true, navigateInfo: navInfo }); + i.contentWindow.appHistory.navigate({ replace: true, info: navInfo }); i.onload = t.step_func_done(() => { assert_true(onnavigate_called); assert_equals(start_url, i.contentWindow.location.href); diff --git a/app-history/navigate/navigate-without-url-arg.html b/app-history/navigate/navigate-without-url-arg.html index 8b60123608f271..5b8ccba27ab9a4 100644 --- a/app-history/navigate/navigate-without-url-arg.html +++ b/app-history/navigate/navigate-without-url-arg.html @@ -14,7 +14,7 @@ onnavigate_called = true; assert_equals(e.info, navInfo); }); - i.contentWindow.appHistory.navigate({ navigateInfo: navInfo }); + i.contentWindow.appHistory.navigate({ info: navInfo }); i.onload = t.step_func_done(() => { assert_true(onnavigate_called); assert_equals(start_url, i.contentWindow.location.href);