chrome/browser/resources/settings/settings_main/settings_main.js - Issue 2156413002: Settings Router Refactor: Migrate to settings.Route.navigateTo calls.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/resources/settings/settings_main/settings_main.js

Issue 2156413002: Settings Router Refactor: Migrate to settings.Route.navigateTo calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix chromeos tests 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

« no previous file with comments | « chrome/browser/resources/settings/search_page/search_page.js ('k') | chrome/browser/resources/settings/settings_menu/settings_menu.js » ('j') | chrome/browser/resources/settings/settings_page/settings_animated_pages.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/resources/settings/settings_main/settings_main.js

diff --git a/chrome/browser/resources/settings/settings_main/settings_main.js b/chrome/browser/resources/settings/settings_main/settings_main.js

index 75daea44da83eb7a5e91e6f11fb9a2c469abc85b..92b73a3cdc6d137a32b57620d993b78998994740 100644

--- a/chrome/browser/resources/settings/settings_main/settings_main.js

+++ b/chrome/browser/resources/settings/settings_main/settings_main.js

@@ -26,7 +26,7 @@ Polymer({

/**

* The current active route.

- * @type {!SettingsRoute}

+ * @type {!settings.Route}

currentRoute: {

type: Object,

@@ -70,11 +70,8 @@ Polymer({

document.addEventListener('toggle-advanced-page', function(e) {

this.showAdvancedPage_ = e.detail;

this.isAdvancedMenuOpen_ = e.detail;

- this.currentRoute = {

- page: this.isAdvancedMenuOpen_ ? 'advanced' : 'basic',

- section: '',

- subpage: [],

- };

+ settings.navigateTo(this.isAdvancedMenuOpen_ ?

+ settings.Route.ADVANCED : settings.Route.BASIC);

if (this.showAdvancedPage_) {

doWhenReady(

function() {

@@ -107,7 +104,7 @@ Polymer({

/**

- * @param {!SettingsRoute} newRoute

+ * @param {!settings.Route} newRoute

* @private

currentRouteChanged_: function(newRoute) {

@@ -139,7 +136,7 @@ Polymer({

if (this.currentRoute.page != 'basic' ||

this.currentRoute.section != '' ||

this.currentRoute.subpage.length != 0) {

- this.currentRoute = {page: 'basic', section: '', subpage: [], url: ''};

+ settings.navigateTo(settings.Route.BASIC);

}