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

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

Issue 2848443002: MD Settings: Remove usage of deprecated iron-flex-layout.html, for CrOS. (Closed)
Patch Set: Address more 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 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/html/i18n_behavior.html"> 2 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
3 <link rel="import" href="chrome://resources/html/polymer.html"> 3 <link rel="import" href="chrome://resources/html/polymer.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"> 4 <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/paper-spinner/paper-spi nner.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/pap er-toggle-button.html">
8 <link rel="import" href="../i18n_setup.html"> 7 <link rel="import" href="../i18n_setup.html">
9 <link rel="import" href="../icons.html"> 8 <link rel="import" href="../icons.html">
10 <link rel="import" href="../settings_shared_css.html"> 9 <link rel="import" href="../settings_shared_css.html">
11 <link rel="import" href="bluetooth_device_dialog.html"> 10 <link rel="import" href="bluetooth_device_dialog.html">
12 <link rel="import" href="bluetooth_device_list_item.html"> 11 <link rel="import" href="bluetooth_device_list_item.html">
13 12
14 <dom-module id="settings-bluetooth-subpage"> 13 <dom-module id="settings-bluetooth-subpage">
15 <template> 14 <template>
16 <style include="settings-shared"> 15 <style include="settings-shared iron-flex">
17 .container { 16 .container {
18 @apply(--settings-list-frame-padding); 17 @apply(--settings-list-frame-padding);
18 display: flex;
19 flex-direction: column;
19 min-height: 10px; 20 min-height: 10px;
20 overflow-y: auto; 21 overflow-y: auto;
21 } 22 }
22 23
23 .header { 24 .header {
24 margin-top: 10px; 25 margin-top: 10px;
25 } 26 }
26 27
27 paper-spinner { 28 paper-spinner {
28 @apply(--cr-icon-height-width); 29 @apply(--cr-icon-height-width);
(...skipping 21 matching lines...) Expand all
50 </div> 51 </div>
51 52
52 <!-- Paired device list --> 53 <!-- Paired device list -->
53 <div class="settings-box first header" hidden="[[!bluetoothToggleState]]"> 54 <div class="settings-box first header" hidden="[[!bluetoothToggleState]]">
54 <div class="start">$i18n{bluetoothDeviceListPaired}</div> 55 <div class="start">$i18n{bluetoothDeviceListPaired}</div>
55 </div> 56 </div>
56 <div id="noPairedDevices" class="list-frame" 57 <div id="noPairedDevices" class="list-frame"
57 hidden="[[!showNoDevices_(bluetoothToggleState, pairedDeviceList_)]]"> 58 hidden="[[!showNoDevices_(bluetoothToggleState, pairedDeviceList_)]]">
58 $i18n{bluetoothNoDevices} 59 $i18n{bluetoothNoDevices}
59 </div> 60 </div>
60 <div id="pairedContainer" class="container layout vertical" 61 <div id="pairedContainer" class="container"
61 scrollable on-device-event="onDeviceEvent_" 62 scrollable on-device-event="onDeviceEvent_"
62 hidden="[[!showDevices_(bluetoothToggleState, pairedDeviceList_)]]"> 63 hidden="[[!showDevices_(bluetoothToggleState, pairedDeviceList_)]]">
63 <iron-list id="pairedDevices" class="vertical-list" 64 <iron-list id="pairedDevices" class="vertical-list"
64 items="[[pairedDeviceList_]]" 65 items="[[pairedDeviceList_]]"
65 selection-enabled selected-item="{{selectedPairedItem_}}" 66 selection-enabled selected-item="{{selectedPairedItem_}}"
66 scroll-target="pairedContainer"> 67 scroll-target="pairedContainer">
67 <template> 68 <template>
68 <bluetooth-device-list-item device="[[item]]" 69 <bluetooth-device-list-item device="[[item]]"
69 tabindex$="[[tabIndex]]"> 70 tabindex$="[[tabIndex]]">
70 </bluetooth-device-list-item> 71 </bluetooth-device-list-item>
71 </template> 72 </template>
72 </iron-list> 73 </iron-list>
73 </div> 74 </div>
74 75
75 <!-- Unpaired device list --> 76 <!-- Unpaired device list -->
76 <div class="settings-box first header" hidden="[[!bluetoothToggleState]]"> 77 <div class="settings-box first header" hidden="[[!bluetoothToggleState]]">
77 <div class="start">$i18n{bluetoothDeviceListUnpaired}</div> 78 <div class="start">$i18n{bluetoothDeviceListUnpaired}</div>
78 <paper-spinner active="[[showSpinner_]]"> 79 <paper-spinner active="[[showSpinner_]]">
79 </paper-spinner> 80 </paper-spinner>
80 </div> 81 </div>
81 <div id="noUnpairedDevices" class="list-frame" 82 <div id="noUnpairedDevices" class="list-frame"
82 hidden="[[!showNoDevices_(bluetoothToggleState, unpairedDeviceList_)]]"> 83 hidden="[[!showNoDevices_(bluetoothToggleState, unpairedDeviceList_)]]">
83 $i18n{bluetoothNoDevicesFound} 84 $i18n{bluetoothNoDevicesFound}
84 </div> 85 </div>
85 <div id="unpairedContainer" class="container layout vertical" 86 <div id="unpairedContainer" class="container"
86 scrollable on-device-event="onDeviceEvent_" 87 scrollable on-device-event="onDeviceEvent_"
87 hidden="[[!showDevices_(bluetoothToggleState, unpairedDeviceList_)]]"> 88 hidden="[[!showDevices_(bluetoothToggleState, unpairedDeviceList_)]]">
88 <iron-list id="unpairedDevices" class="vertical-list" 89 <iron-list id="unpairedDevices" class="vertical-list"
89 items="[[unpairedDeviceList_]]" 90 items="[[unpairedDeviceList_]]"
90 selection-enabled selected-item="{{selectedUnpairedItem_}}" 91 selection-enabled selected-item="{{selectedUnpairedItem_}}"
91 scroll-target="unpairedContainer"> 92 scroll-target="unpairedContainer">
92 <template> 93 <template>
93 <bluetooth-device-list-item device="[[item]]" 94 <bluetooth-device-list-item device="[[item]]"
94 tabindex$="[[tabIndex]]"> 95 tabindex$="[[tabIndex]]">
95 </bluetooth-device-list-item> 96 </bluetooth-device-list-item>
96 </template> 97 </template>
97 </iron-list> 98 </iron-list>
98 </div> 99 </div>
99 100
100 <bluetooth-device-dialog id="deviceDialog" 101 <bluetooth-device-dialog id="deviceDialog"
101 bluetooth-private="[[bluetoothPrivate]]" 102 bluetooth-private="[[bluetoothPrivate]]"
102 dialog-id="[[dialogId_]]" 103 dialog-id="[[dialogId_]]"
103 error-message="[[errorMessage_]]" 104 error-message="[[errorMessage_]]"
104 on-close="onDialogClose_" 105 on-close="onDialogClose_"
105 on-device-event="onDeviceEvent_" 106 on-device-event="onDeviceEvent_"
106 pairing-device="[[pairingDevice_]]"> 107 pairing-device="[[pairingDevice_]]">
107 </bluetooth-device-dialog> 108 </bluetooth-device-dialog>
108 109
109 </template> 110 </template>
110 <script src="bluetooth_subpage.js"></script> 111 <script src="bluetooth_subpage.js"></script>
111 </dom-module> 112 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698