Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(53)

Unified Diff: chrome/browser/resources/settings/internet_page/internet_subpage.html

Issue 2913323003: Settings: Network: Merge Tether networks into Mobile subpage (Closed)
Patch Set: Rebase Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..a2dec03f6095076bd100ae120ef50822a5d5c0e6 100644
--- a/chrome/browser/resources/settings/internet_page/internet_subpage.html
+++ b/chrome/browser/resources/settings/internet_page/internet_subpage.html
@@ -60,7 +60,7 @@
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)]]"
@@ -124,6 +124,24 @@
</template>
</div>
+ <template is="dom-if"
+ if="[[tetherToggleIsVisible_(deviceState, tetherDeviceState)]]">
+ <div class="settings-box two-line">
+ <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"
Kyle Horimoto 2017/06/01 20:15:21 Just making sure: this property makes it so that t
stevenjb 2017/06/01 21:55:03 No, this is for accessibility. I need to add 'on-t
+ checked="[[deviceIsEnabled_(tetherDeviceState)]]"
+ enabled="[[enableToggleIsEnabled_(tetherDeviceState)]]"
+ on-tap="onTetherEnabledTap_">
+ </paper-toggle-button>
+ </div>
+ </template>
</template>
</template>

Powered by Google App Engine
This is Rietveld 408576698