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

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

Issue 2184893002: Settings Router Refactor: Remove route.page legacy property. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@0217-settings-refactor-settings-menu
Patch Set: fix contains issue. 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
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 95ebfc6a5404287d9b6b9711d98c04c73ec9bffe..8048db978ba14c5bdd4f33bf62dcfef2beedf1b9 100644
--- a/chrome/browser/resources/settings/settings_main/settings_main.js
+++ b/chrome/browser/resources/settings/settings_main/settings_main.js
@@ -122,13 +122,13 @@ Polymer({
this.inSubpage_ = newRoute.subpage.length > 0;
this.style.height = this.inSubpage_ ? '100%' : '';
- if (newRoute.page == 'about') {
+ if (settings.Route.ABOUT.contains(newRoute)) {
this.showPages_ = {about: true, basic: false, advanced: false};
} else {
this.showPages_ = {
about: false,
- basic: newRoute.page == 'basic' || !this.inSubpage_,
- advanced: newRoute.page == 'advanced' ||
+ basic: settings.Route.BASIC.contains(newRoute) || !this.inSubpage_,
+ advanced: settings.Route.ADVANCED.contains(newRoute) ||
(!this.inSubpage_ && this.advancedToggleExpanded_),
};

Powered by Google App Engine
This is Rietveld 408576698