Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(6804)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/resources/settings/settings_page/settings_router.js

Issue 2106103006: MD Settings: cr/cros - Guest mode page visibility (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Itr#2 Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/resources/settings/settings_main/settings_main.js ('K') | « chrome/browser/resources/settings/settings_menu/settings_menu.html ('k') | chrome/browser/resources/settings/settings_resources.grd » ('j') | ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 cf987729e2bfd677309fd865ec477f71a459f761..2b8649b51f85127dbb4dee31057a96d2ed760454 100644
--- a/chrome/browser/resources/settings/settings_page/settings_router.js
+++ b/chrome/browser/resources/settings/settings_page/settings_router.js
@@ -91,7 +91,6 @@ Polymer({
},
},
-
/**
* @private {!Array<!CanonicalRoute>}
* The 'url' property is not accessible to other elements.
@@ -104,6 +103,12 @@ Polymer({
subpage: [],
},
{
+ url: '/searchEngines',
+ page: 'basic',
+ section: 'search',
+ subpage: ['search-engines'],
+ },
+ {
url: '/help',
page: 'about',
section: '',
@@ -111,19 +116,17 @@ Polymer({
},
<if expr="chromeos">
{
+ url: '/search',
+ page: 'basic',
+ section: 'search',
+ subpage: [],
+ },
+ {
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',
@@ -142,7 +145,6 @@ Polymer({
section: 'internet',
subpage: ['known-networks'],
},
-</if>
{
url: '/appearance',
page: 'basic',
@@ -156,71 +158,35 @@ Polymer({
subpage: ['appearance-fonts'],
},
{
- url: '/defaultBrowser',
+ url: '/device',
page: 'basic',
- section: 'defaultBrowser',
+ section: 'device',
subpage: [],
},
{
- url: '/search',
+ url: '/pointer-overlay',
page: 'basic',
- section: 'search',
- subpage: [],
+ section: 'device',
+ subpage: ['touchpad'],
},
{
- url: '/searchEngines',
+ url: '/keyboard-overlay',
page: 'basic',
- section: 'search',
- subpage: ['search-engines'],
+ section: 'device',
+ subpage: ['keyboard'],
},
{
- url: '/onStartup',
+ url: '/display',
page: 'basic',
- section: 'onStartup',
- subpage: [],
+ section: 'device',
+ subpage: ['display'],
},
{
- url: '/people',
- page: 'basic',
- section: 'people',
+ url: '/dateTime',
+ page: 'advanced',
+ section: 'dateTime',
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: '/accounts',
- page: 'basic',
- section: 'people',
- subpage: ['users'],
- },
-</if>
{
url: '/privacy',
page: 'advanced',
@@ -342,98 +308,98 @@ Polymer({
page: 'advanced',
section: 'privacy',
subpage: ['site-settings', 'site-settings-category-automatic-downloads',
- 'site-details'],
+ 'site-details'],
},
{
url: '/siteSettings/backgroundSync/details',
page: 'advanced',
section: 'privacy',
subpage: ['site-settings', 'site-settings-category-background-sync',
- 'site-details'],
+ 'site-details'],
},
{
url: '/siteSettings/camera/details',
page: 'advanced',
section: 'privacy',
subpage: ['site-settings', 'site-settings-category-camera',
- 'site-details'],
+ 'site-details'],
},
{
url: '/siteSettings/cookies/details',
page: 'advanced',
section: 'privacy',
subpage: ['site-settings', 'site-settings-category-cookies',
- 'site-details'],
+ 'site-details'],
},
{
url: '/siteSettings/fullscreen/details',
page: 'advanced',
section: 'privacy',
subpage: ['site-settings', 'site-settings-category-fullscreen',
- 'site-details'],
+ 'site-details'],
},
{
url: '/siteSettings/images/details',
page: 'advanced',
section: 'privacy',
subpage: ['site-settings', 'site-settings-category-images',
- 'site-details'],
+ 'site-details'],
},
{
url: '/siteSettings/keygen/details',
page: 'advanced',
section: 'privacy',
subpage: ['site-settings', 'site-settings-category-keygen',
- 'site-details'],
+ 'site-details'],
},
{
url: '/siteSettings/location/details',
page: 'advanced',
section: 'privacy',
subpage: ['site-settings', 'site-settings-category-location',
- 'site-details'],
+ 'site-details'],
},
{
url: '/siteSettings/javascript/details',
page: 'advanced',
section: 'privacy',
subpage: ['site-settings', 'site-settings-category-javascript',
- 'site-details'],
+ 'site-details'],
},
{
url: '/siteSettings/microphone/details',
page: 'advanced',
section: 'privacy',
subpage: ['site-settings', 'site-settings-category-microphone',
- 'site-details'],
+ 'site-details'],
},
{
url: '/siteSettings/notifications/details',
page: 'advanced',
section: 'privacy',
subpage: ['site-settings', 'site-settings-category-notifications',
- 'site-details'],
+ 'site-details'],
},
{
url: '/siteSettings/plugins/details',
page: 'advanced',
section: 'privacy',
subpage: ['site-settings', 'site-settings-category-plugins',
- 'site-details'],
+ 'site-details'],
},
{
url: '/siteSettings/popups/details',
page: 'advanced',
section: 'privacy',
subpage: ['site-settings', 'site-settings-category-popups',
- 'site-details'],
+ 'site-details'],
},
{
url: '/siteSettings/unsandboxedPlugins/details',
page: 'advanced',
section: 'privacy',
subpage: ['site-settings', 'site-settings-category-unsandsboxed-plugins',
- 'site-details'],
+ 'site-details'],
},
{
url: '/clearBrowserData',
@@ -442,13 +408,6 @@ Polymer({
subpage: [],
dialog: 'clear-browsing-data',
},
-<if expr="chromeos">
- {
- url: '/dateTime',
- page: 'advanced',
- section: 'dateTime',
- subpage: [],
- },
{
url: '/bluetooth',
page: 'advanced',
@@ -467,25 +426,6 @@ Polymer({
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',
@@ -504,22 +444,12 @@ Polymer({
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',
@@ -538,43 +468,6 @@ Polymer({
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>
],
@@ -586,6 +479,386 @@ Polymer({
if (event.state && event.state.page)
this.currentRoute = event.state;
}.bind(this));
+
+ // 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: '/appearance',
+ page: 'basic',
+ section: 'appearance',
+ subpage: [],
+ },
+ {
+ url: '/fonts',
+ page: 'basic',
+ section: 'appearance',
+ subpage: ['appearance-fonts'],
+ },
+ {
+ url: '/defaultBrowser',
+ page: 'basic',
+ section: 'defaultBrowser',
+ subpage: [],
+ },
+ {
+ url: '/manageProfile',
+ page: 'basic',
+ section: 'people',
+ subpage: ['manageProfile'],
+ },
+ {
+ url: '/advanced',
+ page: 'advanced',
+ section: '',
+ subpage: [],
+ },
+ {
+ url: '/dateTime',
+ page: 'advanced',
+ section: 'dateTime',
+ subpage: [],
+ },
+ {
+ 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/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/javascript',
+ page: 'advanced',
+ section: 'privacy',
+ subpage: ['site-settings', 'site-settings-category-javascript'],
+ },
+ {
+ 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/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/javascript/details',
+ page: 'advanced',
+ section: 'privacy',
+ subpage: ['site-settings', 'site-settings-category-javascript',
+ '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',
+ },
+ {
+ 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'],
+ },
+ {
+ 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: [],
+ },
+</if>
+<if expr="not chromeos and not is_macosx">
+ {
+ url: '/editDictionary',
+ page: 'advanced',
+ section: 'languages',
+ subpage: ['edit-dictionary'],
+ },
+</if>
+<if expr="chromeos">
+ {
+ 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>
+ {
+ 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: [],
+ },
+ ]);
},
/**
« chrome/browser/resources/settings/settings_main/settings_main.js ('K') | « chrome/browser/resources/settings/settings_menu/settings_menu.html ('k') | chrome/browser/resources/settings/settings_resources.grd » ('j') | ui/webui/resources/cr_elements/cr_toolbar/cr_toolbar.js » ('J')

Powered by Google App Engine
This is Rietveld 408576698