MD Settings: Move settings-advanced-page into settings-basic-page

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.
 
 /**
  * Responds to route changes by expanding, collapsing, or scrolling to sections
  * on the page. Expanded sections take up the full height of the container. At
  * most one section should be expanded at any given time.
  * @polymerBehavior MainPageBehavior
  */
@@ skipping 83 matching lines @@
       return;
     }
 
     var promise;
     var expandedSection = /** @type {?SettingsSectionElement} */(
         this.$$('settings-section.expanded'));
     if (expandedSection) {
       // If the section shouldn't be expanded, collapse it.
       if (!currentRoute.isSubpage() || expandedSection != currentSection) {
         promise = this.collapseSection_(expandedSection);
-        // Scroll to the collapsed section.
-        if (currentSection && scrollToSection)
-          currentSection.scrollIntoView();
       } else {
         // Scroll to top while sliding to another subpage.
         this.scroller.scrollTop = 0;
       }
     } else if (currentSection) {
       // Expand the section into a subpage or scroll to it on the main page.
       if (currentRoute.isSubpage())
         promise = this.expandSection_(currentSection);
       else if (scrollToSection)
         currentSection.scrollIntoView();
@@ skipping 129 matching lines @@
       return Promise.resolve();
     }
 
     // Play the actual collapse animation.
     return new Promise(function(resolve, reject) {
       // Wait for the other sections to show up so we can scroll properly.
       setTimeout(function() {
         var newSection = settings.getCurrentRoute().section &&
             this.getSection(settings.getCurrentRoute().section);
 
-        this.scroller.scrollTop = this.origScrollTop_;
+        // Scroll to the new section or the original position.
+        if (newSection && !settings.lastRouteChangeWasPopstate())
+          newSection.scrollIntoView();
+        else
+          this.scroller.scrollTop = this.origScrollTop_;
 
         this.currentAnimation_ = section.animateCollapse(
             /** @type {!HTMLElement} */(this.scroller));
 
         this.currentAnimation_.finished.catch(function() {
           // The collapse was canceled, so the page is showing a subpage still.
           this.fire('subpage-expand');
         }.bind(this)).then(function() {
           // Clean up after the animation succeeds or cancels.
           section.setFrozen(false);
@@ skipping 31 matching lines @@
     return /** @type {?SettingsSectionElement} */(
         this.$$('settings-section[section="' + section + '"]'));
   },
 };
 
 /** @polymerBehavior */
 var MainPageBehavior = [
   settings.RouteObserverBehavior,
   MainPageBehaviorImpl,
 ];