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

Unified Diff: chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html

Issue 2801403002: MD Settings: Bluetooth: Fix adapter state and discovery (Closed)
Patch Set: Use CHECK instead of early exit Created 3 years, 8 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
« no previous file with comments | « no previous file | chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html
diff --git a/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html b/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html
index 21741343a22e52c8d893b6f8648ec51ef22777b4..8f3623559ccb2aad2e5a0526cc1fae3739791c4a 100644
--- a/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html
+++ b/chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html
@@ -20,11 +20,11 @@
<neon-animatable route-path="default">
<div id="bluetoothDevices"
class="settings-box two-line" actionable on-tap="onTap_">
- <iron-icon icon="[[getIcon_(bluetoothEnabled_)]]"></iron-icon>
+ <iron-icon icon="[[getIcon_(bluetoothToggleState_)]]"></iron-icon>
<div class="middle">
$i18n{bluetoothPageTitle}
<div class="secondary" id="bluetoothSecondary">
- [[getOnOffString_(bluetoothEnabled_,
+ [[getOnOffString_(bluetoothToggleState_,
'$i18nPolymer{deviceOn}', '$i18nPolymer{deviceOff}')]]
</div>
</div>
@@ -41,8 +41,8 @@
</template>
<div class="secondary-action">
<paper-toggle-button id="enableBluetooth"
- checked="{{bluetoothEnabled_}}"
- disabled="[[!adapterState_.available]]" on-tap="stopTap_"
+ checked="{{bluetoothToggleState_}}"
+ disabled$="[[bluetoothToggleDisabled_]]" on-tap="stopTap_"
aria-label="$i18n{bluetoothToggleA11yLabel}">
</paper-toggle-button>
</div>
@@ -54,7 +54,8 @@
page-title="$i18n{bluetoothPageTitle}">
<settings-bluetooth-subpage
adapter-state="[[adapterState_]]"
- bluetooth-enabled="{{bluetoothEnabled_}}"
+ bluetooth-toggle-state="{{bluetoothToggleState_}}"
+ bluetooth-toggle-disabled="[[bluetoothToggleDisabled_]]"
bluetooth="[[bluetooth]]"
bluetooth-private="[[bluetoothPrivate]]">
</settings-bluetooth-subpage>
« no previous file with comments | « no previous file | chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698