Settings Router Refactor: Replace route.subpage usage with route.path

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  * 'settings-main' displays the selected settings page.
  */
 Polymer({
   is: 'settings-main',
@@ skipping 105 matching lines @@
    * @param {boolean} inSubpage
    * @return {boolean}
    * @private
    */
   showAdvancedToggle_: function(showBasicPage, inSubpage) {
     return showBasicPage && !inSubpage;
   },
 
   /** @protected */
   currentRouteChanged: function(newRoute) {
-    this.inSubpage_ = newRoute.subpage.length > 0;
+    this.inSubpage_ = newRoute.isSubpage();
     this.style.height = this.inSubpage_ ? '100%' : '';

[michaelpg, 2016/08/10 18:45:52]

inSubpage_ really means whether a subpage contains this route, dialogs included
(when opened from a subpage) -- maybe it would be easier now to use the
opposite, e.g. this.onRootPage_

for instance, i'd expect this to cause style problems if the dialog is opened
from a subpage

[tommycli, 2016/08/10 18:52:17]

Yeah, I'll just suggest that dialogs can never be from within subpages.

 
     if (settings.Route.ABOUT.contains(newRoute)) {
       this.showPages_ = {about: true, basic: false, advanced: false};
     } else {
       this.showPages_ = {
         about: false,
         basic: settings.Route.BASIC.contains(newRoute) || !this.inSubpage_,
         advanced: settings.Route.ADVANCED.contains(newRoute) ||
             (!this.inSubpage_ && this.advancedToggleExpanded_),
       };
@@ skipping 17 matching lines @@
   /**
    * Return the height that the overscroll padding should be set to.
    * This is used to determine how much padding to apply to the end of the
    * content so that the last element may align with the top of the content
    * area.
    * @return {number}
    * @private
    */
   overscrollHeight_: function() {
     var route = settings.getCurrentRoute();
-    if (route.subpage.length != 0 || this.showPages_.about)
+    if (route.isSubpage() || this.showPages_.about)
       return 0;
 
     var query = 'settings-section[section="' + route.section + '"]';
     var topSection = this.$$('settings-basic-page').$$(query);
     if (!topSection && this.showPages_.advanced)
       topSection = this.$$('settings-advanced-page').$$(query);
 
     if (!topSection || !topSection.offsetParent)
       return 0;
 
@@ skipping 56 matching lines @@
 
   /**
    * @param {(boolean|undefined)} visibility
    * @return {boolean} True unless visibility is false.
    * @private
    */
   showAdvancedSettings_: function(visibility) {
     return visibility !== false;
   },
 });