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 d26933e73018a81a7c08b9a040b9f1d8c298584a..0f7969095c322e422576830ff880a9260004f3dc 100644 |
| --- a/chrome/browser/resources/settings/settings_page/settings_router.js |
| +++ b/chrome/browser/resources/settings/settings_page/settings_router.js |
| @@ -91,507 +91,569 @@ Polymer({ |
| }, |
| }, |
| - |
| /** |
| * @private {!Array<!CanonicalRoute>} |
| * The 'url' property is not accessible to other elements. |
| */ |
| - canonicalRoutes_: [ |
| - { |
| - url: '/', |
| - page: 'basic', |
| - section: '', |
| - subpage: [], |
| - }, |
| - { |
| - url: '/help', |
| - page: 'about', |
| - section: '', |
| - subpage: [], |
| - }, |
| -<if expr="chromeos"> |
| - { |
| - url: '/help/details', |
| - page: 'about', |
| - section: 'about', |
| - subpage: ['detailed-build-info'], |
| - }, |
| -</if> |
| - { |
| - url: '/advanced', |
| - page: 'advanced', |
| - section: '', |
| - subpage: [], |
| - }, |
| -<if expr="chromeos"> |
| - { |
| - url: '/internet', |
| - page: 'basic', |
| - section: 'internet', |
| - subpage: [], |
| - }, |
| - { |
| - url: '/networkDetail', |
| - page: 'basic', |
| - section: 'internet', |
| - subpage: ['network-detail'], |
| - }, |
| - { |
| - url: '/knownNetworks', |
| - page: 'basic', |
| - section: 'internet', |
| - subpage: ['known-networks'], |
| - }, |
| -</if> |
| - { |
| - url: '/appearance', |
| - page: 'basic', |
| - section: 'appearance', |
| - subpage: [], |
| - }, |
| - { |
| - url: '/fonts', |
| - page: 'basic', |
| - section: 'appearance', |
| - subpage: ['appearance-fonts'], |
| - }, |
| - { |
| - url: '/defaultBrowser', |
| - page: 'basic', |
| - section: 'defaultBrowser', |
| - subpage: [], |
| - }, |
| - { |
| - url: '/search', |
| - page: 'basic', |
| - section: 'search', |
| - subpage: [], |
| - }, |
| - { |
| - url: '/searchEngines', |
| - page: 'basic', |
| - section: 'search', |
| - subpage: ['search-engines'], |
| - }, |
| - { |
| - url: '/onStartup', |
| - page: 'basic', |
| - section: 'onStartup', |
| - subpage: [], |
| - }, |
| - { |
| - url: '/people', |
| - page: 'basic', |
| - section: 'people', |
| - subpage: [], |
| - }, |
| + canonicalRoutes_: [], |
| + |
| + /** |
| + * Sets up a history popstate observer. |
| + */ |
| + created: function() { |
| + window.addEventListener('popstate', function(event) { |
| + if (event.state && event.state.page) |
| + this.currentRoute = event.state; |
| + }.bind(this)); |
| + |
| + var searchRoutes_ = [ |
|
michaelpg
2016/07/14 00:31:28
nit: local variables aren't "private", shouldn't h
Moe
2016/07/14 17:19:55
Done.
Dan Beam
2016/07/14 18:36:20
fyi: i've gotten conflicting points of view on thi
|
| + { |
| + url: '/search', |
| + page: 'basic', |
| + section: 'search', |
| + subpage: [], |
| + }, |
| + ]; |
| + |
| + var advancedRoutes_ = [ |
| + { |
| + url: '/advanced', |
| + page: 'advanced', |
| + section: '', |
| + subpage: [], |
| + }, |
| + ]; |
| + |
| <if expr="chromeos"> |
| - { |
| - url: '/changePicture', |
| - page: 'basic', |
| - section: 'people', |
| - subpage: ['changePicture'], |
| - }, |
| -</if> |
| -<if expr="not chromeos"> |
| - { |
| - url: '/manageProfile', |
| - page: 'basic', |
| - section: 'people', |
| - subpage: ['manageProfile'], |
| - }, |
| + var internetRoutes_ = [ |
| + { |
| + url: '/internet', |
| + page: 'basic', |
| + section: 'internet', |
| + subpage: [], |
| + }, |
| + { |
| + url: '/networkDetail', |
| + page: 'basic', |
| + section: 'internet', |
| + subpage: ['network-detail'], |
| + }, |
| + { |
| + url: '/knownNetworks', |
| + page: 'basic', |
| + section: 'internet', |
| + subpage: ['known-networks'], |
| + }, |
| + ]; |
| + |
| + var deviceRoutes_ = [ |
| + { |
| + url: '/device', |
| + page: 'basic', |
| + section: 'device', |
| + subpage: [], |
| + }, |
| + { |
| + url: '/pointer-overlay', |
| + page: 'basic', |
| + section: 'device', |
| + subpage: ['touchpad'], |
| + }, |
| + { |
| + url: '/keyboard-overlay', |
| + page: 'basic', |
| + section: 'device', |
| + subpage: ['keyboard'], |
| + }, |
| + { |
| + url: '/display', |
| + page: 'basic', |
| + section: 'device', |
| + subpage: ['display'], |
| + }, |
| + ]; |
| + |
| + var bluetoothRoutes_ = [ |
| + { |
| + url: '/bluetooth', |
| + page: 'advanced', |
| + section: 'bluetooth', |
| + subpage: [], |
| + }, |
| + { |
| + url: '/bluetoothAddDevice', |
| + page: 'advanced', |
| + section: 'bluetooth', |
| + subpage: ['bluetooth-add-device'], |
| + }, |
| + { |
| + url: '/bluetoothAddDevice/bluetoothPairDevice', |
| + page: 'advanced', |
| + section: 'bluetooth', |
| + subpage: ['bluetooth-add-device', 'bluetooth-pair-device'], |
| + }, |
| + ] |
| </if> |
| - { |
| - url: '/syncSetup', |
| - page: 'basic', |
| - section: 'people', |
| - subpage: ['sync'], |
| - }, |
| + |
| + var appearanceRoutes_ = [ |
| + { |
| + url: '/appearance', |
| + page: 'basic', |
| + section: 'appearance', |
| + subpage: [], |
| + }, |
| + { |
| + url: '/fonts', |
| + page: 'basic', |
| + section: 'appearance', |
| + subpage: ['appearance-fonts'], |
| + }, |
| + ]; |
| + |
| + var dateTimeRoutes_ = [ |
| + { |
| + url: '/dateTime', |
| + page: 'advanced', |
| + section: 'dateTime', |
| + subpage: [], |
| + }, |
| + ]; |
| + |
| + var privacyRoutes_ = [ |
| + { |
| + url: '/privacy', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: [], |
| + }, |
| + { |
| + url: '/certificates', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['manage-certificates'], |
| + }, |
| + { |
| + url: '/siteSettings', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings'], |
| + }, |
| + // Site Category routes. |
| + { |
| + url: '/siteSettings/all', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'all-sites'], |
| + }, |
| + { |
| + url: '/siteSettings/automaticDownloads', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', |
| + 'site-settings-category-automatic-downloads'], |
| + }, |
| + { |
| + url: '/siteSettings/backgroundSync', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-background-sync'], |
| + }, |
| + { |
| + url: '/siteSettings/camera', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-camera'], |
| + }, |
| + { |
| + url: '/siteSettings/cookies', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-cookies'], |
| + }, |
| + { |
| + url: '/siteSettings/fullscreen', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-fullscreen'], |
| + }, |
| + { |
| + url: '/siteSettings/images', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-images'], |
| + }, |
| + { |
| + url: '/siteSettings/handlers', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'protocol-handlers'], |
| + }, |
| + { |
| + url: '/siteSettings/javascript', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-javascript'], |
| + }, |
| + { |
| + url: '/siteSettings/keygen', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-keygen'], |
| + }, |
| + { |
| + url: '/siteSettings/location', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-location'], |
| + }, |
| + { |
| + url: '/siteSettings/microphone', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-microphone'], |
| + }, |
| + { |
| + url: '/siteSettings/notifications', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-notifications'], |
| + }, |
| + { |
| + url: '/siteSettings/plugins', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-plugins'], |
| + }, |
| + { |
| + url: '/siteSettings/popups', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-popups'], |
| + }, |
| + { |
| + url: '/siteSettings/unsandboxedPlugins', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', |
| + 'site-settings-category-unsandboxed-plugins'], |
| + }, |
| + // Site details routes. |
| + { |
| + url: '/siteSettings/all/details', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'all-sites', 'site-details'], |
| + }, |
| + { |
| + url: '/siteSettings/automaticDownloads/details', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-automatic-downloads', |
| + 'site-details'], |
| + }, |
| + { |
| + url: '/siteSettings/backgroundSync/details', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-background-sync', |
| + 'site-details'], |
| + }, |
| + { |
| + url: '/siteSettings/camera/details', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-camera', |
| + 'site-details'], |
| + }, |
| + { |
| + url: '/siteSettings/cookies/details', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-cookies', |
| + 'site-details'], |
| + }, |
| + { |
| + url: '/siteSettings/fullscreen/details', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-fullscreen', |
| + 'site-details'], |
| + }, |
| + { |
| + url: '/siteSettings/images/details', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-images', |
| + 'site-details'], |
| + }, |
| + { |
| + url: '/siteSettings/javascript/details', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-javascript', |
| + 'site-details'], |
| + }, |
| + { |
| + url: '/siteSettings/keygen/details', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-keygen', |
| + 'site-details'], |
| + }, |
| + { |
| + url: '/siteSettings/location/details', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-location', |
| + 'site-details'], |
| + }, |
| + { |
| + url: '/siteSettings/microphone/details', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-microphone', |
| + 'site-details'], |
| + }, |
| + { |
| + url: '/siteSettings/notifications/details', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-notifications', |
| + 'site-details'], |
| + }, |
| + { |
| + url: '/siteSettings/plugins/details', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-plugins', |
| + 'site-details'], |
| + }, |
| + { |
| + url: '/siteSettings/popups/details', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', 'site-settings-category-popups', |
| + 'site-details'], |
| + }, |
| + { |
| + url: '/siteSettings/unsandboxedPlugins/details', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: ['site-settings', |
| + 'site-settings-category-unsandsboxed-plugins', |
| + 'site-details'], |
| + }, |
| + { |
| + url: '/clearBrowserData', |
| + page: 'advanced', |
| + section: 'privacy', |
| + subpage: [], |
| + dialog: 'clear-browsing-data', |
| + }, |
| + ]; |
| + |
| + var languagesRoutes_ = [ |
| + { |
| + url: '/languages', |
| + page: 'advanced', |
| + section: 'languages', |
| + subpage: [], |
| + }, |
| + { |
| + url: '/manageLanguages', |
| + page: 'advanced', |
| + section: 'languages', |
| + subpage: ['manage-languages'], |
| + }, |
| + { |
| + url: '/languages/edit', |
| + page: 'advanced', |
| + section: 'languages', |
| + subpage: ['language-detail'], |
| + }, |
| <if expr="chromeos"> |
| - { |
| - url: '/quickUnlock/authenticate', |
| - page: 'basic', |
| - section: 'people', |
| - subpage: ['quick-unlock-authenticate'], |
| - }, |
| - { |
| - url: '/accounts', |
| - page: 'basic', |
| - section: 'people', |
| - subpage: ['users'], |
| - }, |
| + { |
| + url: '/inputMethods', |
| + page: 'advanced', |
| + section: 'languages', |
| + subpage: ['manage-input-methods'], |
| + }, |
| </if> |
| - { |
| - url: '/privacy', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: [], |
| - }, |
| - { |
| - url: '/certificates', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['manage-certificates'], |
| - }, |
| - { |
| - url: '/siteSettings', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings'], |
| - }, |
| - // Site Category routes. |
| - { |
| - url: '/siteSettings/all', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'all-sites'], |
| - }, |
| - { |
| - url: '/siteSettings/automaticDownloads', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-automatic-downloads'], |
| - }, |
| - { |
| - url: '/siteSettings/backgroundSync', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-background-sync'], |
| - }, |
| - { |
| - url: '/siteSettings/camera', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-camera'], |
| - }, |
| - { |
| - url: '/siteSettings/cookies', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-cookies'], |
| - }, |
| - { |
| - url: '/siteSettings/fullscreen', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-fullscreen'], |
| - }, |
| - { |
| - url: '/siteSettings/images', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-images'], |
| - }, |
| - { |
| - url: '/siteSettings/handlers', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'protocol-handlers'], |
| - }, |
| - { |
| - url: '/siteSettings/javascript', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-javascript'], |
| - }, |
| - { |
| - url: '/siteSettings/keygen', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-keygen'], |
| - }, |
| - { |
| - url: '/siteSettings/location', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-location'], |
| - }, |
| - { |
| - url: '/siteSettings/microphone', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-microphone'], |
| - }, |
| - { |
| - url: '/siteSettings/notifications', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-notifications'], |
| - }, |
| - { |
| - url: '/siteSettings/plugins', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-plugins'], |
| - }, |
| - { |
| - url: '/siteSettings/popups', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-popups'], |
| - }, |
| - { |
| - url: '/siteSettings/unsandboxedPlugins', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-unsandboxed-plugins'], |
| - }, |
| - // Site details routes. |
| - { |
| - url: '/siteSettings/all/details', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'all-sites', 'site-details'], |
| - }, |
| - { |
| - url: '/siteSettings/automaticDownloads/details', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-automatic-downloads', |
| - 'site-details'], |
| - }, |
| - { |
| - url: '/siteSettings/backgroundSync/details', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-background-sync', |
| - 'site-details'], |
| - }, |
| - { |
| - url: '/siteSettings/camera/details', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-camera', |
| - 'site-details'], |
| - }, |
| - { |
| - url: '/siteSettings/cookies/details', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-cookies', |
| - 'site-details'], |
| - }, |
| - { |
| - url: '/siteSettings/fullscreen/details', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-fullscreen', |
| - 'site-details'], |
| - }, |
| - { |
| - url: '/siteSettings/images/details', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-images', |
| - 'site-details'], |
| - }, |
| - { |
| - url: '/siteSettings/javascript/details', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-javascript', |
| - 'site-details'], |
| - }, |
| - { |
| - url: '/siteSettings/keygen/details', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-keygen', |
| - 'site-details'], |
| - }, |
| - { |
| - url: '/siteSettings/location/details', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-location', |
| - 'site-details'], |
| - }, |
| - { |
| - url: '/siteSettings/microphone/details', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-microphone', |
| - 'site-details'], |
| - }, |
| - { |
| - url: '/siteSettings/notifications/details', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-notifications', |
| - 'site-details'], |
| - }, |
| - { |
| - url: '/siteSettings/plugins/details', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-plugins', |
| - 'site-details'], |
| - }, |
| - { |
| - url: '/siteSettings/popups/details', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-popups', |
| - 'site-details'], |
| - }, |
| - { |
| - url: '/siteSettings/unsandboxedPlugins/details', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: ['site-settings', 'site-settings-category-unsandsboxed-plugins', |
| - 'site-details'], |
| - }, |
| - { |
| - url: '/clearBrowserData', |
| - page: 'advanced', |
| - section: 'privacy', |
| - subpage: [], |
| - dialog: 'clear-browsing-data', |
| - }, |
| -<if expr="chromeos"> |
| - { |
| - url: '/dateTime', |
| - page: 'advanced', |
| - section: 'dateTime', |
| - subpage: [], |
| - }, |
| - { |
| - url: '/bluetooth', |
| - page: 'advanced', |
| - section: 'bluetooth', |
| - subpage: [], |
| - }, |
| - { |
| - url: '/bluetoothAddDevice', |
| - page: 'advanced', |
| - section: 'bluetooth', |
| - subpage: ['bluetooth-add-device'], |
| - }, |
| - { |
| - url: '/bluetoothAddDevice/bluetoothPairDevice', |
| - page: 'advanced', |
| - section: 'bluetooth', |
| - subpage: ['bluetooth-add-device', 'bluetooth-pair-device'], |
| - }, |
| +<if expr="not chromeos and not is_macosx"> |
| + { |
| + url: '/editDictionary', |
| + page: 'advanced', |
| + section: 'languages', |
| + subpage: ['edit-dictionary'], |
| + }, |
| </if> |
| - { |
| - url: '/autofill', |
| - page: 'advanced', |
| - section: 'passwordsAndForms', |
| - subpage: ['manage-autofill'], |
| - }, |
| - { |
| - url: '/passwords', |
| - page: 'advanced', |
| - section: 'passwordsAndForms', |
| - subpage: [], |
| - }, |
| - { |
| - url: '/managePasswords', |
| - page: 'advanced', |
| - section: 'passwordsAndForms', |
| - subpage: ['manage-passwords'], |
| - }, |
| - { |
| - url: '/languages', |
| - page: 'advanced', |
| - section: 'languages', |
| - subpage: [], |
| - }, |
| - { |
| - url: '/manageLanguages', |
| - page: 'advanced', |
| - section: 'languages', |
| - subpage: ['manage-languages'], |
| - }, |
| - { |
| - url: '/languages/edit', |
| - page: 'advanced', |
| - section: 'languages', |
| - subpage: ['language-detail'], |
| - }, |
| + ]; |
| + |
| + var a11yRoutes_ = [ |
| + { |
| + url: '/accessibility', |
| + page: 'advanced', |
| + section: 'a11y', |
| + subpage: [], |
| + }, |
| + ]; |
| + |
| + var printingRoutes_ = [ |
| + { |
| + url: '/printing', |
| + page: 'advanced', |
| + section: 'printing', |
| + subpage: [], |
| + }, |
| + ]; |
| + |
| + var downloadRoutes_ = [ |
| + { |
| + url: '/downloadsDirectory', |
| + page: 'advanced', |
| + section: 'downloads', |
| + subpage: [], |
| + }, |
| + ]; |
| + |
| + this.canonicalRoutes_ = [].concat( |
| <if expr="chromeos"> |
| - { |
| - url: '/inputMethods', |
| - page: 'advanced', |
| - section: 'languages', |
| - subpage: ['manage-input-methods'], |
| - }, |
| + { |
| + url: '/help/details', |
| + page: 'about', |
| + section: 'about', |
| + subpage: ['detailed-build-info'], |
| + }, |
| + a11yRoutes_, |
| + advancedRoutes_, |
| + appearanceRoutes_, |
| + bluetoothRoutes_, |
| + dateTimeRoutes_, |
| + deviceRoutes_, |
| + downloadRoutes_, |
| + internetRoutes_, |
| + languagesRoutes_, |
| + printingRoutes_, |
| + privacyRoutes_, |
| + searchRoutes_, |
| </if> |
| -<if expr="not is_macosx"> |
| - { |
| - url: '/editDictionary', |
| - page: 'advanced', |
| - section: 'languages', |
| - subpage: ['edit-dictionary'], |
| - }, |
| + { |
| + url: '/', |
| + page: 'basic', |
| + section: '', |
| + subpage: [], |
| + }, |
| + { |
| + url: '/searchEngines', |
| + page: 'basic', |
| + section: 'search', |
| + subpage: ['search-engines'], |
| + }, |
| + { |
| + url: '/help', |
| + page: 'about', |
| + section: '', |
| + subpage: [], |
| + } |
| + ); |
| + |
| + // Do not add the following routes if the user is a Guest user. |
| + if (loadTimeData.getBoolean('isGuest')) |
| + return; |
| + |
| + this.canonicalRoutes_ = this.canonicalRoutes_.concat( |
| +<if expr="not chromeos"> |
| + { |
| + url: '/defaultBrowser', |
| + page: 'basic', |
| + section: 'defaultBrowser', |
| + subpage: [], |
| + }, |
| + { |
| + url: '/manageProfile', |
| + page: 'basic', |
| + section: 'people', |
| + subpage: ['manageProfile'], |
| + }, |
| + { |
| + url: '/system', |
| + page: 'advanced', |
| + section: 'system', |
| + subpage: [], |
| + }, |
| + a11yRoutes_, |
| + advancedRoutes_, |
| + appearanceRoutes_, |
| + dateTimeRoutes_, |
| + downloadRoutes_, |
| + languagesRoutes_, |
| + printingRoutes_, |
| + privacyRoutes_, |
| + searchRoutes_, |
| </if> |
| - { |
| - url: '/downloadsDirectory', |
| - page: 'advanced', |
| - section: 'downloads', |
| - subpage: [], |
| - }, |
| - { |
| - url: '/printing', |
| - page: 'advanced', |
| - section: 'printing', |
| - subpage: [], |
| - }, |
| - { |
| - url: '/accessibility', |
| - page: 'advanced', |
| - section: 'a11y', |
| - subpage: [], |
| - }, |
| - { |
| - url: '/system', |
| - page: 'advanced', |
| - section: 'system', |
| - subpage: [], |
| - }, |
| - { |
| - url: '/reset', |
| - page: 'advanced', |
| - section: 'reset', |
| - subpage: [], |
| - }, |
| <if expr="chromeos"> |
| - { |
| - url: '/device', |
| - page: 'basic', |
| - section: 'device', |
| - subpage: [], |
| - }, |
| - { |
| - url: '/pointer-overlay', |
| - page: 'basic', |
| - section: 'device', |
| - subpage: ['touchpad'], |
| - }, |
| - { |
| - url: '/keyboard-overlay', |
| - page: 'basic', |
| - section: 'device', |
| - subpage: ['keyboard'], |
| - }, |
| - { |
| - url: '/display', |
| - page: 'basic', |
| - section: 'device', |
| - subpage: ['display'], |
| - }, |
| + { |
| + url: '/changePicture', |
| + page: 'basic', |
| + section: 'people', |
| + subpage: ['changePicture'], |
| + }, |
| + { |
| + url: '/quickUnlock/authenticate', |
| + page: 'basic', |
| + section: 'people', |
| + subpage: ['quick-unlock-authenticate'], |
| + }, |
| + { |
| + url: '/accounts', |
| + page: 'basic', |
| + section: 'people', |
| + subpage: ['users'], |
| + }, |
| </if> |
| - ], |
| - |
| - /** |
| - * Sets up a history popstate observer. |
| - */ |
| - created: function() { |
| - window.addEventListener('popstate', function(event) { |
| - if (event.state && event.state.page) |
| - this.currentRoute = event.state; |
| - }.bind(this)); |
| + { |
| + url: '/onStartup', |
| + page: 'basic', |
| + section: 'onStartup', |
| + subpage: [], |
| + }, |
| + { |
| + url: '/people', |
| + page: 'basic', |
| + section: 'people', |
| + subpage: [], |
| + }, |
| + { |
| + url: '/syncSetup', |
| + page: 'basic', |
| + section: 'people', |
| + subpage: ['sync'], |
| + }, |
| + { |
| + url: '/autofill', |
| + page: 'advanced', |
| + section: 'passwordsAndForms', |
| + subpage: ['manage-autofill'], |
| + }, |
| + { |
| + url: '/passwords', |
| + page: 'advanced', |
| + section: 'passwordsAndForms', |
| + subpage: [], |
| + }, |
| + { |
| + url: '/managePasswords', |
| + page: 'advanced', |
| + section: 'passwordsAndForms', |
| + subpage: ['manage-passwords'], |
| + }, |
| + { |
| + url: '/reset', |
| + page: 'advanced', |
| + section: 'reset', |
| + subpage: [], |
| + } |
| + ); |
| }, |
| /** |