MD Settings: Fix subpage navigation focus for bluetooth+internet

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 29 matching lines @@
 
   /**
    * The last "previous" route reported by the router.
    * @private {?settings.Route}
    */
   previousRoute_: null,
 
   /** @override */
   created: function() {
     // Observe the light DOM so we know when it's ready.
-    this.lightDomObserver_ = Polymer.dom(this).observeNodes(
-        this.lightDomChanged_.bind(this));
+    this.lightDomObserver_ =
+        Polymer.dom(this).observeNodes(this.lightDomChanged_.bind(this));
   },
 
   /** @override */
   attached: function() {
     this.outline_ = cr.ui.FocusOutlineManager.forDocument(document);
   },
 
   /**
    * @param {!Event} e
    * @private
    */
   onIronSelect_: function(e) {
     if (!this.focusConfig || !this.previousRoute_)
       return;
 
     // Don't attempt to focus any anchor element, unless last navigation was a
     // 'pop' (backwards) navigation.
     if (!settings.lastRouteChangeWasPopstate())
       return;
 
     // Only handle iron-select events from neon-animatable elements and the
     // given whitelist of settings-subpage instances.
-    if (!e.detail.item.matches(
-        'neon-animatable, ' +
-        'settings-subpage#site-settings, ' +
+    var whitelist = 'settings-subpage#site-settings, ' +
         'settings-subpage[route-path=\"' +
-            settings.Route.SITE_SETTINGS_COOKIES.path + '\"]')) {
+        settings.Route.SITE_SETTINGS_COOKIES.path + '\"]';
+
+// <if expr="chromeos">
+    whitelist += ', settings-subpage[route-path=\"' +
+        settings.Route.INTERNET_NETWORKS.path + '\"]';
+// </if>
+
+    if (!e.detail.item.matches('neon-animatable, ' + whitelist))
       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
       // expected.
       var toFocus = this.querySelector(selector);
@@ skipping 26 matching lines @@
   },
 
   /**
    * Calls currentRouteChanged with the deferred route change info.
    * @private
    */
   runQueuedRouteChange_: function() {
     if (!this.queuedRouteChange_)
       return;
     this.async(this.currentRouteChanged.bind(
-        this,
-        this.queuedRouteChange_.newRoute,
+        this, this.queuedRouteChange_.newRoute,
         this.queuedRouteChange_.oldRoute));
   },
 
   /** @protected */
   currentRouteChanged: function(newRoute, oldRoute) {
     this.previousRoute_ = oldRoute;
 
     if (newRoute.section == this.section && newRoute.isSubpage()) {
       this.switchToSubpage_(newRoute, oldRoute);
     } else {
@@ skipping 57 matching lines @@
     var routePath = settings.getCurrentRoute().path;
     var template = Polymer.dom(this).querySelector(
         'template[route-path="' + routePath + '"]');
 
     // Nothing to do if the subpage isn't wrapped in a <template> or the
     // template is already stamped.
     if (!template || template.if)
       return;
 
     // Set the subpage's id for use by neon-animated-pages.
-    var subpage = /** @type {{_content: DocumentFragment}} */(template)._content
-        .querySelector('settings-subpage');
+    var subpage = /** @type {{_content: DocumentFragment}} */ (template)
+                      ._content.querySelector('settings-subpage');
     subpage.setAttribute('route-path', routePath);
 
     // Carry over the 'no-search' attribute from the template to the stamped
     // 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();
   },
 });