Chromium Code Reviews| 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 81d9f613387139ca8c35423f0946dd09ec75645e..892d8edfefccae670f16de23e9149434186a3167 100644 |
| --- a/chrome/browser/resources/settings/settings_page/settings_router.js |
| +++ b/chrome/browser/resources/settings/settings_page/settings_router.js |
| @@ -66,7 +66,12 @@ Polymer({ |
| currentRouteTitles: { |
| notify: true, |
| type: Object, |
| - value: function() { return {}; }, |
| + value: function() { |
| + return { |
| + pageTitle: '', |
| + subpageTitles: [], |
| + }; |
| + }, |
| }, |
| }, |
| @@ -111,6 +116,15 @@ Polymer({ |
| subpage: ['search-engines', 'search-engines-advanced'], |
| subpageTitles: ['searchEnginesPageTitle', 'advancedPageTitle'], |
| }, |
| +<if expr="not chromeos"> |
| + { |
| + url: '/manageProfile', |
| + page: 'basic', |
| + section: 'people', |
| + subpage: ['manageProfile'], |
| + subpageTitles: ['editPerson'], |
| + }, |
| +</if> |
| { |
| url: '/syncSetup', |
| page: 'basic', |
| @@ -250,12 +264,12 @@ Polymer({ |
| // Push the current route to the history state, so when the user |
| // navigates with the browser back button, we can recall the route. |
| if (oldRoute) { |
| - history.pushState(historicState, null, route.url); |
| + window.history.pushState(historicState, document.title, route.url); |
|
Dan Beam
2016/01/07 02:41:20
such a useless param...
tommycli
2016/01/07 22:08:23
Acknowledged.
|
| } else { |
| // For the very first route (oldRoute will be undefined), we replace |
| // the existing state instead of pushing a new one. This is to allow |
| // the user to use the browser back button to exit Settings entirely. |
| - history.replaceState(historicState, null); |
| + window.history.replaceState(historicState, document.title); |
| } |
| return; |