| 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 846c19059f0b48ae7ebc579cb24f3b0e0ac0f603..9f249ae7ab8507ecc3e5338a23382c2534deb3a0 100644
|
| --- a/chrome/browser/resources/settings/settings_page/settings_router.js
|
| +++ b/chrome/browser/resources/settings/settings_page/settings_router.js
|
| @@ -96,519 +96,9 @@ 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: [],
|
| - },
|
| -<if expr="chromeos">
|
| - {
|
| - url: '/changePicture',
|
| - page: 'basic',
|
| - section: 'people',
|
| - subpage: ['changePicture'],
|
| - },
|
| -</if>
|
| -<if expr="not chromeos">
|
| - {
|
| - url: '/manageProfile',
|
| - page: 'basic',
|
| - section: 'people',
|
| - subpage: ['manageProfile'],
|
| - },
|
| -</if>
|
| - {
|
| - url: '/syncSetup',
|
| - page: 'basic',
|
| - section: 'people',
|
| - subpage: ['sync'],
|
| - },
|
| -<if expr="chromeos">
|
| - {
|
| - url: '/quickUnlock/authenticate',
|
| - page: 'basic',
|
| - section: 'people',
|
| - subpage: ['quick-unlock-authenticate'],
|
| - },
|
| - {
|
| - url: '/quickUnlock/chooseMethod',
|
| - page: 'basic',
|
| - section: 'people',
|
| - subpage: ['quick-unlock-choose-method'],
|
| - },
|
| - {
|
| - url: '/quickUnlock/setupPin',
|
| - page: 'basic',
|
| - section: 'people',
|
| - subpage: ['quick-unlock-choose-method', 'quick-unlock-setup-pin'],
|
| - },
|
| - {
|
| - url: '/accounts',
|
| - page: 'basic',
|
| - section: 'people',
|
| - subpage: ['users'],
|
| - },
|
| -</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>
|
| - {
|
| - 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'],
|
| - },
|
| -<if expr="chromeos">
|
| - {
|
| - url: '/inputMethods',
|
| - page: 'advanced',
|
| - section: 'languages',
|
| - subpage: ['manage-input-methods'],
|
| - },
|
| -</if>
|
| -<if expr="not is_macosx">
|
| - {
|
| - url: '/editDictionary',
|
| - page: 'advanced',
|
| - section: 'languages',
|
| - subpage: ['edit-dictionary'],
|
| - },
|
| -</if>
|
| - {
|
| - url: '/downloadsDirectory',
|
| - page: 'advanced',
|
| - section: 'downloads',
|
| - subpage: [],
|
| - },
|
| - {
|
| - url: '/printing',
|
| - page: 'advanced',
|
| - section: 'printing',
|
| - subpage: [],
|
| - },
|
| -<if expr="chromeos">
|
| - {
|
| - url: '/cupsPrinters',
|
| - page: 'advanced',
|
| - section: 'printing',
|
| - subpage: ['cups-printers'],
|
| - },
|
| -</if>
|
| - {
|
| - url: '/cloudPrinters',
|
| - page: 'advanced',
|
| - section: 'printing',
|
| - subpage: ['cloud-printers'],
|
| - },
|
| - {
|
| - 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'],
|
| - },
|
| -</if>
|
| - ],
|
| + canonicalRoutes_: Object.keys(settings.Route).map(function(key) {
|
| + return settings.Route[key];
|
| + }),
|
|
|
| /**
|
| * Sets up a history popstate observer.
|
|
|