MD Settings: Fix subpage navigation focus for bluetooth+internet

chrome/browser/resources/settings/internet_page/internet_detail_page.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-internet-detail' is the settings subpage containing details
  * for a network.
  */
 (function() {
@@ skipping 126 matching lines @@
     },
   },
 
   /**
    * Listener function for chrome.networkingPrivate.onNetworksChanged event.
    * @type {?function(!Array<string>)}
    * @private
    */
   networksChangedListener_: null,
 
+  /** @private {boolean} */
+  didSetFocus_: false,
+
   /**
    * settings.RouteObserverBehavior
    * @param {!settings.Route} route
    * @protected
    */
   currentRouteChanged: function(route) {
     if (route != settings.Route.NETWORK_DETAIL) {
       if (this.networksChangedListener_) {
         this.networkingPrivate.onNetworksChanged.removeListener(
             this.networksChangedListener_);
@@ skipping 16 matching lines @@
     var type = /** @type {!chrome.networkingPrivate.NetworkType} */ (
                    queryParams.get('type')) ||
         CrOnc.Type.WI_FI;
     var name = queryParams.get('name') || type;
     this.networkProperties = {
       GUID: this.guid,
       Type: type,
       ConnectionState: CrOnc.ConnectionState.NOT_CONNECTED,
       Name: {Active: name},
     };
+    this.didSetFocus_ = false;
     this.getNetworkDetails_();
   },
 
   /** @private */
+  maybeSetFocus_: function() {
+    if (this.didSetFocus_)
+      return;
+    this.didSetFocus_ = true;
+    var button = this.$$('#buttonDiv .primary-button:not([hidden])');
+    if (!button)
+      button = this.$$('#buttonDiv .secondary-button:not([hidden])');
+    button.focus();
+  },
+
+  /** @private */
   close_: function() {
     // Delay navigating until the next render frame to allow other subpages to
     // load first.
     setTimeout(function() {
       settings.navigateTo(settings.Route.INTERNET);
     });
   },
 
   /** @private */
   networkPropertiesChanged_: function() {
@@ skipping 81 matching lines @@
       }
       this.close_();
       return;
     }
     if (!properties) {
       console.error('No properties for: ' + this.guid);
       this.close_();
       return;
     }
     this.networkProperties = properties;
+    this.maybeSetFocus_();
   },
 
   /**
    * networkingPrivate.getState callback.
    * @param {CrOnc.NetworkStateProperties} state The network state properties.
    * @private
    */
   getStateCallback_: function(state) {
     if (!state) {
       // If |state| is null, the network is no longer visible, close this.
       console.error('Network no longer exists: ' + this.guid);
       this.networkProperties = undefined;
       this.close_();
     }
     this.networkProperties = {
       GUID: state.GUID,
       Type: state.Type,
       Connectable: state.Connectable,
       ConnectionState: state.ConnectionState,
     };
+    this.maybeSetFocus_();
   },
 
   /**
    * @param {!chrome.networkingPrivate.NetworkConfigProperties} onc The ONC
    *     network properties.
    * @private
    */
   setNetworkProperties_: function(onc) {
     assert(!!this.guid);
     this.networkingPrivate.setProperties(this.guid, onc, function() {
@@ skipping 224 matching lines @@
   onConfigureTap_: function() {
     chrome.send('configureNetwork', [this.guid]);
   },
 
   /** @private */
   onViewAccountTap_: function() {
     // startActivate() will show the account page for activated networks.
     this.networkingPrivate.startActivate(this.guid);
   },
 
-  /** @const {string} */ CR_EXPAND_BUTTON_TAG: 'CR-EXPAND-BUTTON',
+  /** @const {string} */
+  CR_EXPAND_BUTTON_TAG: 'CR-EXPAND-BUTTON',
 
   /**
    * @param {Event} event
    * @private
    */
   toggleAdvancedExpanded_: function(event) {
     if (event.target.tagName == this.CR_EXPAND_BUTTON_TAG)
       return;  // Already handled.
     this.advancedExpanded_ = !this.advancedExpanded_;
   },
@@ skipping 374 matching lines @@
    */
   allPropertiesMatch_: function(curValue, newValue) {
     for (var key in newValue) {
       if (newValue[key] != curValue[key])
         return false;
     }
     return true;
   }
 });
 })();