Settings: Network: Merge Tether networks into Mobile subpage

chrome/browser/resources/settings/internet_page/internet_subpage.html

 <link rel="import" href="chrome://resources/html/polymer.html">
 
 <link rel="import" href="chrome://resources/cr_elements/network/cr_network_list.html">
 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout-classes.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper-icon-button-light.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html">
 <link rel="import" href="../settings_shared_css.html">
 
@@ skipping 42 matching lines @@
         <div id="onOff" class="start" on$="[[deviceIsEnabled_(deviceState)]]">
           [[getOffOnString_(deviceState,
             '$i18nPolymer{deviceOn}', '$i18nPolymer{deviceOff}')]]
         </div>
         <!-- The add button in this row is only shown for WiFi networks. -->
         <paper-icon-button id="addButton" icon="settings:add-wifi"
             hidden$="[[!showAddButton_(deviceState, globalPolicy)]]"
             aria-label="$i18n{internetAddWiFi}"
             on-tap="onAddButtonTap_" tabindex$="[[tabindex]]">
         </paper-icon-button>
-        <paper-toggle-button  id="deviceEnabledButton"
+        <paper-toggle-button id="deviceEnabledButton"
             aria-label$="[[getToggleA11yString_(deviceState)]]"
             checked="[[deviceIsEnabled_(deviceState)]]"
-            enabled="[[enableToggleIsEnabled_(deviceState)]]"
+            disabled="[[!enableToggleIsEnabled_(deviceState)]]"
             on-tap="onDeviceEnabledTap_">
         </paper-toggle-button>
       </div>
     </template>
 
     <template is="dom-if" if="[[knownNetworksIsVisible_(deviceState)]]">
       <div actionable class="settings-box" on-tap="onKnownNetworksTap_">
         <div class="start">$i18n{knownNetworksButton}</div>
         <button class="subpage-arrow" is="paper-icon-button-light"
             aria-label="$i18n{knownNetworksButton}">
@@ skipping 40 matching lines @@
                 on-selected="onNetworkSelected_">
             </cr-network-list>
             <div hidden$="[[haveThirdPartyVpnNetwork_(thirdPartyVpns_, item)]]"
                 class="no-networks">
               $i18n{internetNoNetworks}
             </div>
           </template>
         </template>
       </div>
 
+      <template is="dom-if"
+          if="[[tetherToggleIsVisible_(deviceState, tetherDeviceState)]]">
+        <div class="settings-box two-line" actionable
+            on-tap="onTetherEnabledTap_">

[Kyle Horimoto, 2017/06/01 22:21:46]

nit: Now that you added this, do you still need the <paper-toggle-button>'s
on-tap property?

[stevenjb, 2017/06/01 22:37:02]

I suppose I don't. Done.

+          <div class="start">
+            $i18n{internetToggleTetherLabel}
+            <div id="tetherSecondary" class="secondary">
+              $i18n{internetToggleTetherSubtext}
+            </div>
+          </div>
+          <paper-toggle-button id="tetherEnabledButton"
+              aria-label="$i18n{internetToggleTetherLabel}"
+              aria-describedby="tetherSecondary"
+              checked="[[deviceIsEnabled_(tetherDeviceState)]]"
+              disabled="[[!tetherToggleIsEnabled_(deviceState,
+                  tetherDeviceState)]]"
+              on-tap="onTetherEnabledTap_">
+          </paper-toggle-button>
+        </div>
+      </template>
     </template>
 
   </template>
   <script src="internet_subpage.js"></script>
 </dom-module>