Settings: Network: Merge Tether networks into Mobile subpage

chrome/browser/resources/settings/internet_page/internet_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-page' is the settings page containing internet
  * settings.
  */
 Polymer({
@@ skipping 258 matching lines @@
 
   /**
    * @return {string}
    * @private
    */
   getNetworksPageTitle_: function() {
     return this.i18n('OncType' + this.subpageType_);
   },
 
   /**
+   * @param {string} subpageType
+   * @param {!Object<!CrOnc.DeviceStateProperties>|undefined} deviceStates
+   * @return {!CrOnc.DeviceStateProperties|undefined}
+   * @private
+   */
+  getDeviceState_: function(subpageType, deviceStates) {
+    // If both Tether and Cellular are enabled, use the Cellular device state
+    // when directly navigating to the Tether page.
+    if (subpageType == CrOnc.Type.TETHER &&
+        this.deviceStates[CrOnc.Type.CELLULAR]) {
+      subpageType = CrOnc.Type.CELLULAR;
+    }
+    return deviceStates[subpageType];
+  },
+
+  /**
    * @param {!{detail: {type: string}}} event
    * @private
    */
   onShowKnownNetworks_: function(event) {
     this.detailType_ = event.detail.Type;
     var params = new URLSearchParams;
     params.append('type', event.detail.Type);
     this.knownNetworksType_ = event.detail.type;
     settings.navigateTo(settings.Route.KNOWN_NETWORKS, params);
   },
@@ skipping 157 matching lines @@
             message == 'connected' || message == 'Error.InvalidNetworkGuid') {
           return;
         }
         console.error(
             'Unexpected networkingPrivate.startConnect error: ' + message +
             ' For: ' + properties.GUID);
       }
     });
   },
 });