Settings: Fix Site Details subpage routing

chrome/browser/resources/settings/settings_page/settings_animated_pages.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-animated-pages' is a container for a page and animated subpages.
  * It provides a set of common behaviors and animations.
  *
  * Example:
@@ skipping 74 matching lines @@
     // Don't manipulate the light DOM until it's ready.
     if (!this.lightDomReady_) {
       this.queuedRouteChange_ = this.queuedRouteChange_ || {oldRoute: oldRoute};
       this.queuedRouteChange_.newRoute = newRoute;
       return;
     }
 
     this.ensureSubpageInstance_();
 
     if (oldRoute) {
-      if (oldRoute.isSubpage() && oldRoute.contains(newRoute)) {
-        // Slide left for a descendant subpage.
+      if (oldRoute.isSubpage() && newRoute.depth > oldRoute.depth) {

[michaelpg, 2016/08/17 00:40:49]

Wait a minute, isn't this exactly what we had previously (comparing
subpage.length)?

[tommycli, 2016/08/17 16:17:00]

Previously we checked if the subpage.length > 0, but didn't compare the lengths
of oldRoute vs newRoute.

+        // Slide left for a deeper subpage.
         this.$.animatedPages.exitAnimation = 'slide-left-animation';
         this.$.animatedPages.entryAnimation = 'slide-from-right-animation';
-      } else if (newRoute.contains(oldRoute)) {
-        // Slide right for an ancestor subpage.
+      } else if (oldRoute.depth > newRoute.depth) {
+        // Slide right for an shallower subpage.

[michaelpg, 2016/08/17 00:40:49]

s/an/a

[tommycli, 2016/08/17 16:17:00]

Done.

         this.$.animatedPages.exitAnimation = 'slide-right-animation';
         this.$.animatedPages.entryAnimation = 'slide-from-left-animation';
       } else {
         // The old route is not a subpage or is at the same level, so just fade.
         this.$.animatedPages.exitAnimation = 'fade-out-animation';
         this.$.animatedPages.entryAnimation = 'fade-in-animation';
 
         if (!oldRoute.isSubpage()) {
           // Set the height the expand animation should start at before
           // beginning the transition to the new subpage.
@@ skipping 33 matching lines @@
     // instance, such that the stamped instance will also be ignored by the
     // searching algorithm.
     if (template.hasAttribute('no-search'))
       subpage.setAttribute('no-search', '');
 
     // Render synchronously so neon-animated-pages can select the subpage.
     template.if = true;
     template.render();
   },
 });