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

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

Issue 2562123002: MD Settings: Bluetooth: Update icon and title to reflect state (Closed)
Patch Set: Rebase Created 4 years 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/cr_elements/cr_scrollable_behavior.h tml"> 1 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml">
2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html"> 2 <link rel="import" href="chrome://resources/cr_elements/policy/cr_policy_pref_in dicator.html">
3 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 3 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
4 <link rel="import" href="chrome://resources/html/polymer.html"> 4 <link rel="import" href="chrome://resources/html/polymer.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/classe s/iron-flex-layout.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/iron-list/iron-list.htm l">
8 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
(...skipping 23 matching lines...) Expand all
34 settings-bluetooth-pair-device-dialog { 34 settings-bluetooth-pair-device-dialog {
35 height: 400px; 35 height: 400px;
36 padding: 0; 36 padding: 0;
37 width: 500px; 37 width: 500px;
38 } 38 }
39 </style> 39 </style>
40 <settings-animated-pages id="pages" section="bluetooth"> 40 <settings-animated-pages id="pages" section="bluetooth">
41 <neon-animatable route-path="default"> 41 <neon-animatable route-path="default">
42 <div class="settings-box first" actionable 42 <div class="settings-box first" actionable
43 on-tap="toggleDeviceListExpanded_"> 43 on-tap="toggleDeviceListExpanded_">
44 <iron-icon icon="settings:bluetooth"></iron-icon> 44 <iron-icon icon="[[getIcon_(bluetoothEnabled_, deviceConnected_)]]">
45 <span class="middle">$i18n{bluetoothEnable}</span> 45 </iron-icon>
46 <span class="middle">[[getTitle_(bluetoothEnabled_)]]</span>
46 <cr-policy-pref-indicator 47 <cr-policy-pref-indicator
47 pref="[[prefs.cros.device.allow_bluetooth]]" 48 pref="[[prefs.cros.device.allow_bluetooth]]"
48 hidden="[[prefs.cros.device.allow_bluetooth.value]]"> 49 hidden="[[prefs.cros.device.allow_bluetooth.value]]">
49 </cr-policy-pref-indicator> 50 </cr-policy-pref-indicator>
50 <cr-expand-button id="expandListButton" 51 <cr-expand-button id="expandListButton"
51 alt="$i18n{bluetoothExpandA11yLabel}" 52 alt="$i18n{bluetoothExpandA11yLabel}"
52 hidden$="[[!bluetoothEnabled_]]" 53 hidden$="[[!bluetoothEnabled_]]"
53 expanded="{{deviceListExpanded_}}"> 54 expanded="{{deviceListExpanded_}}">
54 </cr-expand-button> 55 </cr-expand-button>
55 <div class="secondary-action"> 56 <div class="secondary-action">
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 on-device-event="onDeviceEvent_" 100 on-device-event="onDeviceEvent_"
100 on-response="onResponse_" 101 on-response="onResponse_"
101 pairing-device="[[pairingDevice_]]" 102 pairing-device="[[pairingDevice_]]"
102 pairing-event="[[pairingEvent_]]"> 103 pairing-event="[[pairingEvent_]]">
103 </bluetooth-device-dialog> 104 </bluetooth-device-dialog>
104 </template> 105 </template>
105 106
106 </template> 107 </template>
107 <script src="bluetooth_page.js"></script> 108 <script src="bluetooth_page.js"></script>
108 </dom-module> 109 </dom-module>
OLDNEW
« no previous file with comments | « chrome/app/settings_strings.grdp ('k') | chrome/browser/resources/settings/bluetooth_page/bluetooth_page.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698