MD Settings: Fix Advanced Toggle when on an Advanced section route.

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.
 
 /**
  * @typedef {{about: boolean, basic: boolean, advanced: boolean}}
  */
 var MainPageVisibility;
 
 /**
@@ skipping 74 matching lines @@
     pageVisibility: {
       type: Object,
       value: function() { return {}; },
     },
   },
 
   /** @override */
   attached: function() {
     document.addEventListener('toggle-advanced-page', function(e) {
       this.advancedToggleExpanded_ = e.detail;
-      this.currentRouteChanged(settings.getCurrentRoute());
+      this.updatePagesShown_();
     }.bind(this));
 
     var currentRoute = settings.getCurrentRoute();
     this.hasExpandedSection_ = currentRoute && currentRoute.isSubpage();
   },
 
   /** @private */
   overscrollChanged_: function() {
     if (!this.overscroll_ && this.boundScroll_) {
       this.offsetParent.removeEventListener('scroll', this.boundScroll_);
@@ skipping 39 matching lines @@
     var inSearchMode = !!this.previousShowPages_;
     return !inSearchMode && this.showPages_.basic && !this.hasExpandedSection_;
   },
 
   currentRouteChanged: function(newRoute) {
     // When the route changes from a sub-page to the main page, immediately
     // update hasExpandedSection_ to unhide the other sections.
     if (!newRoute.isSubpage())
       this.hasExpandedSection_ = false;
 
+    if (settings.Route.ADVANCED.contains(newRoute))
+      this.advancedToggleExpanded_ = true;
+
     this.updatePagesShown_();
   },
 
   /** @private */
   onSubpageExpand_: function() {
     // The subpage finished expanding fully. Hide pages other than the current
     // section's parent page.
     this.hasExpandedSection_ = true;
     this.updatePagesShown_();
   },
 
   /**
    * Updates the hidden state of the about, basic and advanced pages, based on
    * the current route and the Advanced toggle state.
    * @private
    */
   updatePagesShown_: function() {
     var currentRoute = settings.getCurrentRoute();
     if (settings.Route.ABOUT.contains(currentRoute)) {
       this.showPages_ = {about: true, basic: false, advanced: false};
     } else {
       this.showPages_ = {
         about: false,
         basic: settings.Route.BASIC.contains(currentRoute) ||
             !this.hasExpandedSection_,
-        advanced: settings.Route.ADVANCED.contains(currentRoute) ||
-            (!this.hasExpandedSection_ && this.advancedToggleExpanded_),
+        advanced: this.hasExpandedSection_ ?
+                      settings.Route.ADVANCED.contains(currentRoute) :
+                      this.advancedToggleExpanded_,

[dschuyler, 2016/09/14 00:11:02]

nit: the indent looks incorrect. Is it indented from 
the "this"? Would it be ok to indent four from "advanced"?

(I guess another option would be to indent line 182 off
of "settings" so that they are similar, but I'd prefer
to indent from the start of line in both cases).

[tommycli, 2016/09/14 00:12:22]

Done.

       };
-
-      if (this.showPages_.advanced) {
-        assert(!this.pageVisibility ||
-            this.pageVisibility.advancedSettings !== false);
-        this.advancedToggleExpanded_ = true;
-      }
     }
 
     // Wait for any other changes prior to calculating the overflow padding.
     setTimeout(function() {
       // Ensure any dom-if reflects the current properties.
       Polymer.dom.flush();
 
       this.setOverscroll_(this.overscrollHeight_());
     }.bind(this));
   },
@@ skipping 111 matching lines @@
 
   /**
    * @param {(boolean|undefined)} visibility
    * @return {boolean} True unless visibility is false.
    * @private
    */
   showAdvancedSettings_: function(visibility) {
     return visibility !== false;
   },
 });