[MD settings] scroll to sections from subpages

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

 // Copyright 2016 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.
 
 // Fast out, slow in.
 var EASING_FUNCTION = 'cubic-bezier(0.4, 0, 0.2, 1)';
 var EXPAND_DURATION = 350;
 
 /**
  * Calls |readyTest| repeatedly until it returns true, then calls
@@ skipping 376 matching lines @@
       // Allow the page to load before expanding the section. TODO(michaelpg):
       // Time this better when refactoring settings-animated-pages.
       setTimeout(function() {
         var section = this.getSection_(newRoute.section);
         if (section)
           this.expandSection(section);
       }.bind(this));
       return;
     }
 
-    if (!newRouteIsSubpage && oldRouteIsSubpage) {
-      var section = this.getSection_(oldRoute.section);
-      if (section)
-        this.collapseSection(section);
-    } else if (newRouteIsSubpage &&
-               (!oldRouteIsSubpage || newRoute.section != oldRoute.section)) {
-      var section = this.getSection_(newRoute.section);
-      if (section)
-        this.expandSection(section);
-    } else if (newRoute && newRoute.section &&
-        this.$$('[data-page=' + newRoute.page + ']')) {
-      this.scrollToSection_();
+    if (newRouteIsSubpage) {
+      if (!oldRouteIsSubpage || newRoute.section != oldRoute.section) {
+        var section = this.getSection_(newRoute.section);
+        if (section)

[michaelpg, 2016/07/20 19:45:05]

when does this fail? seems like something the router should handle

[dschuyler, 2016/07/20 20:20:42]

This code was simply moved in this CL, so I
don't have details about the specific logic.
My guess though, would be a unit test issue.
That's where I've seen checks like that in
the past.

+          this.expandSection(section);
+      }
+    } else {
+      if (oldRouteIsSubpage) {
+        var section = this.getSection_(oldRoute.section);
+        if (section)
+          this.collapseSection(section);
+      }
+
+      if (newRoute && newRoute.section &&
+          this.$$('[data-page=' + newRoute.page + ']')) {
+        this.scrollToSection_();
+      }
     }
   },
 
   /**
    * Helper function to get a section from the local DOM.
    * @param {string} section Section name of the element to get.
    * @return {?SettingsSectionElement}
    * @private
    */
   getSection_: function(section) {
     return /** @type {?SettingsSectionElement} */(
         this.$$('[section=' + section + ']'));
   },
 };
 
 
 /** @polymerBehavior */
 var RoutableBehavior = [
   MainPageBehavior,
   RoutableBehaviorImpl
 ];