| Index: chrome/browser/resources/settings/settings_page/settings_router.js
|
| diff --git a/chrome/browser/resources/settings/settings_page/settings_router.js b/chrome/browser/resources/settings/settings_page/settings_router.js
|
| index bff9b677176b8e32e0936a0d677bf27b64ad7717..bee6aa9572c3856a83bef9605fd8dc6e18d94b81 100644
|
| --- a/chrome/browser/resources/settings/settings_page/settings_router.js
|
| +++ b/chrome/browser/resources/settings/settings_page/settings_router.js
|
| @@ -8,6 +8,7 @@
|
| * page: string,
|
| * section: string,
|
| * subpage: !Array<string>,
|
| + * dialog: (string|undefined),
|
| * }}
|
| */
|
| var SettingsRoute;
|
| @@ -58,6 +59,7 @@ Polymer({
|
| page: route.page,
|
| section: route.section,
|
| subpage: route.subpage,
|
| + dialog: route.dialog,
|
| };
|
| }
|
| }
|
| @@ -425,7 +427,8 @@ Polymer({
|
| url: '/clearBrowserData',
|
| page: 'advanced',
|
| section: 'privacy',
|
| - subpage: ['clear-browsing-data'],
|
| + subpage: [],
|
| + dialog: 'clear-browsing-data',
|
| },
|
| <if expr="chromeos">
|
| {
|
| @@ -584,12 +587,13 @@ Polymer({
|
| currentRouteChanged_: function(newRoute, oldRoute) {
|
| for (var i = 0; i < this.routes_.length; ++i) {
|
| var route = this.routes_[i];
|
| - if (route.page == newRoute.page && route.section == newRoute.section &&
|
| + if (route.page == newRoute.page &&
|
| + route.section == newRoute.section &&
|
| + route.dialog == newRoute.dialog &&
|
| route.subpage.length == newRoute.subpage.length &&
|
| newRoute.subpage.every(function(value, index) {
|
| return value == route.subpage[index];
|
| })) {
|
| -
|
| // Update the property containing the titles for the current route.
|
| this.currentRouteTitles = {
|
| pageTitle: loadTimeData.getString(route.page + 'PageTitle'),
|
| @@ -605,6 +609,7 @@ Polymer({
|
| page: newRoute.page,
|
| section: newRoute.section,
|
| subpage: newRoute.subpage,
|
| + dialog: newRoute.dialog,
|
| };
|
|
|
| // Push the current route to the history state, so when the user
|
|
|