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

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

Issue 2387053004: [MD settings] tweaks to what is shown in about page; and css cleanup (Closed)
Patch Set: fixing chromeos browser tests Created 4 years, 2 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/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">
11 <link rel="import" href="/icons.html"> 11 <link rel="import" href="/icons.html">
12 <link rel="import" href="/settings_page/settings_animated_pages.html"> 12 <link rel="import" href="/settings_page/settings_animated_pages.html">
13 <link rel="import" href="/settings_shared_css.html"> 13 <link rel="import" href="/settings_shared_css.html">
14 <link rel="import" href="bluetooth_device_dialog.html"> 14 <link rel="import" href="bluetooth_device_dialog.html">
15 <link rel="import" href="bluetooth_device_list_item.html"> 15 <link rel="import" href="bluetooth_device_list_item.html">
16 16
17 <dom-module id="settings-bluetooth-page"> 17 <dom-module id="settings-bluetooth-page">
18 <template> 18 <template>
19 <style include="settings-shared"> 19 <style include="settings-shared">
20 iron-icon {
21 -webkit-margin-end: var(--iron-icon-spacing);
22 }
23
24 cr-expand-button { 20 cr-expand-button {
25 -webkit-margin-end: 10px; 21 -webkit-margin-end: 10px;
26 } 22 }
27 23
28 #deviceList { 24 #deviceList {
29 max-height: 300px; 25 max-height: 300px;
30 overflow-y: auto; 26 overflow-y: auto;
31 } 27 }
32 28
33 .no-devices { 29 .no-devices {
34 min-height: var(--settings-row-min-height); 30 min-height: var(--settings-row-min-height);
35 } 31 }
36 32
37 settings-bluetooth-add-device-dialog, 33 settings-bluetooth-add-device-dialog,
38 settings-bluetooth-pair-device-dialog { 34 settings-bluetooth-pair-device-dialog {
39 height: 400px; 35 height: 400px;
40 padding: 0; 36 padding: 0;
41 width: 500px; 37 width: 500px;
42 } 38 }
43 </style> 39 </style>
44 <settings-animated-pages id="pages" section="bluetooth"> 40 <settings-animated-pages id="pages" section="bluetooth">
45 <neon-animatable route-path="default"> 41 <neon-animatable route-path="default">
46 <div class="settings-box first"> 42 <div class="settings-box first">
47 <div class="layout horizontal center flex"> 43 <iron-icon icon="settings:bluetooth"></iron-icon>
48 <iron-icon icon="settings:bluetooth"></iron-icon> 44 <span class="middle">$i18n{bluetoothEnable}</span>
49 <span class="flex">$i18n{bluetoothEnable}</span> 45 <cr-expand-button id="expandListButton"
50 <cr-expand-button id="expandListButton" 46 alt="$i18n{bluetoothExpandA11yLabel}"
51 alt="$i18n{bluetoothExpandA11yLabel}" 47 hidden$="[[!bluetoothEnabled]]"
52 hidden$="[[!bluetoothEnabled]]" 48 expanded="{{deviceListExpanded}}">
53 expanded="{{deviceListExpanded}}"> 49 </cr-expand-button>
54 </cr-expand-button> 50 <paper-toggle-button id="enableBluetooth"
55 <paper-toggle-button id="enableBluetooth" 51 checked="{{bluetoothEnabled}}"
56 checked="{{bluetoothEnabled}}" 52 disabled="[[!adapterState.available]]"
57 disabled="[[!adapterState.available]]" 53 on-change="onBluetoothEnabledChange_">
58 on-change="onBluetoothEnabledChange_"> 54 </paper-toggle-button>
59 </paper-toggle-button> 55 <cr-policy-pref-indicator
60 <cr-policy-pref-indicator 56 pref="[[prefs.cros.device.allow_bluetooth]]"
61 pref="[[prefs.cros.device.allow_bluetooth]]" 57 hidden="[[prefs.cros.device.allow_bluetooth.value]]">
62 hidden="[[prefs.cros.device.allow_bluetooth.value]]"> 58 </cr-policy-pref-indicator>
63 </cr-policy-pref-indicator>
64 </div>
65 </div> 59 </div>
66 <iron-collapse opened="[[canShowDeviceList_(bluetoothEnabled, 60 <iron-collapse opened="[[canShowDeviceList_(bluetoothEnabled,
67 deviceListExpanded)]]"> 61 deviceListExpanded)]]">
68 <div id="deviceList" class="list-frame vertical-list" 62 <div id="deviceList" class="list-frame vertical-list"
69 on-device-event="onDeviceEvent_"> 63 on-device-event="onDeviceEvent_">
70 <div id="container" class="layout vertical" scrollable> 64 <div id="container" class="layout vertical" scrollable>
71 <iron-list items="[[getPairedOrConnecting_(deviceList.*)]]" 65 <iron-list items="[[getPairedOrConnecting_(deviceList.*)]]"
72 selection-enabled selected-item="{{selectedItem}}" 66 selection-enabled selected-item="{{selectedItem}}"
73 scroll-target="container"> 67 scroll-target="container">
74 <template> 68 <template>
(...skipping 27 matching lines...) Expand all
102 on-device-event="onDeviceEvent_" 96 on-device-event="onDeviceEvent_"
103 on-response="onResponse_" 97 on-response="onResponse_"
104 pairing-device="[[pairingDevice]]" 98 pairing-device="[[pairingDevice]]"
105 pairing-event="[[pairingEvent]]"> 99 pairing-event="[[pairingEvent]]">
106 </bluetooth-device-dialog> 100 </bluetooth-device-dialog>
107 </template> 101 </template>
108 102
109 </template> 103 </template>
110 <script src="bluetooth_page.js"></script> 104 <script src="bluetooth_page.js"></script>
111 </dom-module> 105 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698