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

Side by Side Diff: chrome/browser/resources/settings/bluetooth_page/bluetooth_page.html

Issue 2143823002: MD Settings: Bluetooth: Show policy indicator when disabled by policy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@issue_602538_bluetooth_fixes_1
Patch Set: Fix tests Created 4 years, 5 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 unified diff | Download patch
OLDNEW
1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l">
6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
9 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html">
9 <link rel="import" href="/icons.html"> 10 <link rel="import" href="/icons.html">
10 <link rel="import" href="/settings_page/settings_animated_pages.html"> 11 <link rel="import" href="/settings_page/settings_animated_pages.html">
11 <link rel="import" href="/settings_shared_css.html"> 12 <link rel="import" href="/settings_shared_css.html">
12 <link rel="import" href="bluetooth_device_dialog.html"> 13 <link rel="import" href="bluetooth_device_dialog.html">
13 <link rel="import" href="bluetooth_device_list_item.html"> 14 <link rel="import" href="bluetooth_device_list_item.html">
14 15
15 <dom-module id="settings-bluetooth-page"> 16 <dom-module id="settings-bluetooth-page">
16 <template> 17 <template>
17 <style include="settings-shared"> 18 <style include="settings-shared">
18 iron-icon { 19 iron-icon {
(...skipping 29 matching lines...) Expand all
48 <span class="flex">$i18n{bluetoothEnable}</span> 49 <span class="flex">$i18n{bluetoothEnable}</span>
49 <cr-expand-button id="expandListButton" 50 <cr-expand-button id="expandListButton"
50 hidden$="[[!bluetoothEnabled]]" 51 hidden$="[[!bluetoothEnabled]]"
51 expanded="{{deviceListExpanded}}"> 52 expanded="{{deviceListExpanded}}">
52 </cr-expand-button> 53 </cr-expand-button>
53 <paper-toggle-button id="enableBluetooth" 54 <paper-toggle-button id="enableBluetooth"
54 checked="{{bluetoothEnabled}}" 55 checked="{{bluetoothEnabled}}"
55 disabled="[[!adapterState.available]]" 56 disabled="[[!adapterState.available]]"
56 on-change="onBluetoothEnabledChange_"> 57 on-change="onBluetoothEnabledChange_">
57 </paper-toggle-button> 58 </paper-toggle-button>
59 <cr-policy-pref-indicator
60 pref="[[prefs.cros.device.allow_bluetooth]]"
61 hidden="[[prefs.cros.device.allow_bluetooth.value]]">
62 </cr-policy-pref-indicator>
58 </div> 63 </div>
59 </div> 64 </div>
60 <iron-collapse opened="[[canShowDeviceList_(bluetoothEnabled, 65 <iron-collapse opened="[[canShowDeviceList_(bluetoothEnabled,
61 deviceListExpanded)]]"> 66 deviceListExpanded)]]">
62 <div id="deviceList" class="list-frame vertical-list" 67 <div id="deviceList" class="list-frame vertical-list"
63 on-device-event="onDeviceEvent_"> 68 on-device-event="onDeviceEvent_">
64 <template is="dom-repeat" items="[[deviceList]]" 69 <template is="dom-repeat" items="[[deviceList]]"
65 filter="deviceIsPairedOrConnecting_"> 70 filter="deviceIsPairedOrConnecting_">
66 <bluetooth-device-list-item device="[[item]]" class="list-item"> 71 <bluetooth-device-list-item device="[[item]]" class="list-item">
67 </bluetooth-device-list-item> 72 </bluetooth-device-list-item>
(...skipping 21 matching lines...) Expand all
89 on-iron-overlay-closed="onDialogClosed_" 94 on-iron-overlay-closed="onDialogClosed_"
90 on-iron-overlay-opened="onDialogOpened_" 95 on-iron-overlay-opened="onDialogOpened_"
91 on-response="onResponse_" 96 on-response="onResponse_"
92 pairing-device="[[pairingDevice]]" 97 pairing-device="[[pairingDevice]]"
93 pairing-event="[[pairingEvent]]"> 98 pairing-event="[[pairingEvent]]">
94 </bluetooth-device-dialog> 99 </bluetooth-device-dialog>
95 100
96 </template> 101 </template>
97 <script src="bluetooth_page.js"></script> 102 <script src="bluetooth_page.js"></script>
98 </dom-module> 103 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698