MD Settings: Restore focus after exiting Content settings sub-subpages.

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 38 matching lines @@
     // Observe the light DOM so we know when it's ready.
     this.lightDomObserver_ = Polymer.dom(this).observeNodes(
         this.lightDomChanged_.bind(this));
   },
 
   /**
    * @param {!Event} e
    * @private
    */
   onIronSelect_: function(e) {
-    if (!this.focusConfig || !this.previousRoute_ ||
-        e.detail.item.tagName != 'NEON-ANIMATABLE') {
+    if (!this.focusConfig || !this.previousRoute_)
+      return;
+
+    if (e.detail.item.tagName != 'NEON-ANIMATABLE' &&
+        // Don't handle iron-select events from any subpage except from the
+        // SITE_SETTINGS subpage.
+        !(e.detail.item.tagName == 'SETTINGS-SUBPAGE' &&
+          e.detail.item.id == 'site-settings')) {

[Dan Beam, 2017/04/12 01:05:26]

!e.detail.item.matches('neon-animatable, settings-subpage#site-settings')

[dpapad, 2017/04/12 03:22:52]

Done.

       return;
     }
 
     var selector = this.focusConfig.get(this.previousRoute_.path);
     if (selector) {
       // neon-animatable has "display: none" until the animation finishes, so
       // calling focus() on any of its children has no effect until
       // "display: none" is removed. Therefore can't call focus() from within
       // the currentRouteChanged callback. Using 'iron-select' listener which
       // fires after the animation has finished allows focus() to work as
@@ skipping 110 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();
   },
 });