chrome/browser/resources/settings/settings_page/main_page_behavior.js - Issue 2224163002: Settings Router Refactor: Replace route.subpage usage with route.path

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_page/main_page_behavior.js

Issue 2224163002: Settings Router Refactor: Replace route.subpage usage with route.path (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: fix Created 4 years, 4 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/route.js ('K') | « chrome/browser/resources/settings/settings_main/settings_main.js ('k') | chrome/browser/resources/settings/settings_page/settings_animated_pages.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_page/main_page_behavior.js

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

index 5e408b2ec9c7e96a2709b7a7133e4003c5d440a2..bec2cd45954bd4d0a3c1f2b5bd85e32d9d834dae 100644

--- a/chrome/browser/resources/settings/settings_page/main_page_behavior.js

+++ b/chrome/browser/resources/settings/settings_page/main_page_behavior.js

@@ -39,11 +39,11 @@ var MainPageBehaviorImpl = {

/**

* @param {!settings.Route} newRoute

- * @param {!settings.Route} oldRoute

+ * @param {settings.Route} oldRoute

currentRouteChanged: function(newRoute, oldRoute) {

- var newRouteIsSubpage = newRoute && newRoute.subpage.length;

- var oldRouteIsSubpage = oldRoute && oldRoute.subpage.length;

+ var newRouteIsSubpage = newRoute.isSubpage();

+ var oldRouteIsSubpage = oldRoute && oldRoute.isSubpage();

if (!oldRoute && newRouteIsSubpage) {

// Allow the page to load before expanding the section. TODO(michaelpg):