Settings: Network: Merge Tether networks into Mobile subpage

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

Index: chrome/browser/resources/settings/internet_page/internet_subpage.html
diff --git a/chrome/browser/resources/settings/internet_page/internet_subpage.html b/chrome/browser/resources/settings/internet_page/internet_subpage.html
index e865ab9286e28d158ddd2763b92be094a305f312..773123122232dd2f3fd6394a706ce6f5c6703235 100644
--- a/chrome/browser/resources/settings/internet_page/internet_subpage.html
+++ b/chrome/browser/resources/settings/internet_page/internet_subpage.html
@@ -60,10 +60,10 @@
             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>
@@ -124,6 +124,26 @@
         </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>