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

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

Issue 2655043005: MD Settings: Bluetooth: Move device list to subpage (Closed)
Patch Set: . Created 3 years, 10 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_dialog/cr_dialog.html "> 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html ">
2 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml"> 2 <link rel="import" href="chrome://resources/cr_elements/cr_scrollable_behavior.h tml">
3 <link rel="import" href="chrome://resources/html/cr.html"> 3 <link rel="import" href="chrome://resources/html/cr.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-flex-layout/classe s/iron-flex-layout.html"> 5 <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-list/iron-list.htm l"> 6 <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/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-input/paper-input .html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html">
10 <link rel="import" href="/bluetooth_page/bluetooth_device_list_item.html"> 10 <link rel="import" href="/bluetooth_page/bluetooth_device_list_item.html">
(...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 tabindex$="[[tabIndex]]"> 96 tabindex$="[[tabIndex]]">
97 </bluetooth-device-list-item> 97 </bluetooth-device-list-item>
98 </template> 98 </template>
99 </iron-list> 99 </iron-list>
100 </div> 100 </div>
101 </div> 101 </div>
102 <template is="dom-if" if="[[isDialogType_(dialogId, 'pairDevice')]]"> 102 <template is="dom-if" if="[[isDialogType_(dialogId, 'pairDevice')]]">
103 <div id="pairing" class="settings-box first layout vertical center 103 <div id="pairing" class="settings-box first layout vertical center
104 center-justified"> 104 center-justified">
105 <div class="dialog-message"> 105 <div class="dialog-message">
106 [[getMessage_(pairingDevice, pairingEvent)]] 106 [[getMessage_(pairingDevice, pairingEvent_)]]
107 </div> 107 </div>
108 <div hidden$="[[!showEnterPincode_(pairingEvent)]]"> 108 <div hidden$="[[!showEnterPincode_(pairingEvent_)]]">
109 <paper-input id="pincode" minlength="1" maxlength="16" 109 <paper-input id="pincode" minlength="1" maxlength="16"
110 type="text" auto-validate value="{{pinOrPass}}"> 110 type="text" auto-validate value="{{pinOrPass}}">
111 </paper-input> 111 </paper-input>
112 </div> 112 </div>
113 <div hidden$="[[!showEnterPasskey_(pairingEvent)]]"> 113 <div hidden$="[[!showEnterPasskey_(pairingEvent_)]]">
114 <paper-input id="passkey" minlength="6" maxlength="6" 114 <paper-input id="passkey" minlength="6" maxlength="6"
115 type="text" auto-validate value="{{pinOrPass}}"> 115 type="text" auto-validate value="{{pinOrPass}}">
116 </paper-input> 116 </paper-input>
117 </div> 117 </div>
118 <div id="pinDiv" class="layout horizontal center center-justified" 118 <div id="pinDiv" class="layout horizontal center center-justified"
119 hidden="[[!showDisplayPassOrPin_(pairingEvent)]]"> 119 hidden="[[!showDisplayPassOrPin_(pairingEvent_)]]">
120 <template is="dom-repeat" items="[[digits]]"> 120 <template is="dom-repeat" items="[[digits]]">
121 <span class$="[[getPinClass_(index, pairingEvent)]]"> 121 <span class$="[[getPinClass_(index, pairingEvent_)]]">
122 [[getPinDigit_(index, pairingEvent)]] 122 [[getPinDigit_(index, pairingEvent_)]]
123 </span> 123 </span>
124 </template> 124 </template>
125 <span class$="[[getPinClass_(-1, pairingEvent)]]" 125 <span class$="[[getPinClass_(-1, pairingEvent_)]]"
126 hidden="[[showAcceptReject_(pairingEvent)]]"> 126 hidden="[[showAcceptReject_(pairingEvent_)]]">
127 $i18n{bluetoothEnterKey} 127 $i18n{bluetoothEnterKey}
128 </span> 128 </span>
129 </div> 129 </div>
130 </div> 130 </div>
131 </template> 131 </template>
132 <template is="dom-if" 132 <template is="dom-if"
133 if="[[isDialogType_('connectError', dialogId)]]"> 133 if="[[isDialogType_('connectError', dialogId)]]">
134 <div class="settings-box first layout vertical center 134 <div class="settings-box first layout vertical center
135 center-justified"> 135 center-justified">
136 <div class="dialog-message">[[errorMessage]]</div> 136 <div class="dialog-message">[[errorMessage]]</div>
137 </div> 137 </div>
138 </template> 138 </template>
139 </div> 139 </div>
140 </div> 140 </div>
141 <div class="button-container"> 141 <div class="button-container">
142 <template is="dom-if" if="[[isDialogType_('addDevice', dialogId)]]"> 142 <template is="dom-if" if="[[isDialogType_('addDevice', dialogId)]]">
143 <div id="scanning" class="layout horizontal center flex" 143 <div id="scanning" class="layout horizontal center flex"
144 hidden$="[[!adapterState.discovering]]"> 144 hidden$="[[!adapterState.discovering]]">
145 <paper-spinner active="[[adapterState.discovering]]"> 145 <paper-spinner active="[[adapterState.discovering]]">
146 </paper-spinner> 146 </paper-spinner>
147 <span>$i18n{bluetoothScanning}</span> 147 <span>$i18n{bluetoothScanning}</span>
148 </div> 148 </div>
149 <paper-button class="end-justified" on-tap="onCancelTap_"> 149 <paper-button class="end-justified" on-tap="onCancelTap_">
150 $i18n{cancel} 150 $i18n{cancel}
151 </paper-button> 151 </paper-button>
152 </template> 152 </template>
153 <template is="dom-if" if="[[isDialogType_('pairDevice', dialogId)]]"> 153 <template is="dom-if" if="[[isDialogType_('pairDevice', dialogId)]]">
154 <paper-button hidden$="[[!showAcceptReject_(pairingEvent)]]" 154 <paper-button hidden$="[[!showAcceptReject_(pairingEvent_)]]"
155 on-tap="onAcceptTap_">$i18n{bluetoothAccept}</paper-button> 155 on-tap="onAcceptTap_">$i18n{bluetoothAccept}</paper-button>
156 <paper-button hidden$="[[!showAcceptReject_(pairingEvent)]]" 156 <paper-button hidden$="[[!showAcceptReject_(pairingEvent_)]]"
157 on-tap="onRejectTap_">$i18n{bluetoothReject}</paper-button> 157 on-tap="onRejectTap_">$i18n{bluetoothReject}</paper-button>
158 <paper-button hidden$="[[!showConnect_(pairingEvent)]]" 158 <paper-button hidden$="[[!showConnect_(pairingEvent_)]]"
159 disabled="[[!enableConnect_(pairingEvent, pinOrPass)]]" 159 disabled="[[!enableConnect_(pairingEvent_, pinOrPass)]]"
160 on-tap="onConnectTap_">$i18n{bluetoothPair}</paper-button> 160 on-tap="onConnectTap_">$i18n{bluetoothPair}</paper-button>
161 <paper-button hidden$="[[!showDismiss_(pairingDevice, pairingEvent)]]" 161 <paper-button
162 hidden$="[[!showDismiss_(pairingDevice, pairingEvent_)]]"
162 on-tap="close">$i18n{bluetoothDismiss}</paper-button> 163 on-tap="close">$i18n{bluetoothDismiss}</paper-button>
163 <paper-button hidden$="[[showDismiss_(pairingDevice, pairingEvent)]]" 164 <paper-button hidden$="[[showDismiss_(pairingDevice, pairingEvent_)]]"
164 on-tap="onCancelTap_"> 165 on-tap="onCancelTap_">
165 $i18n{cancel} 166 $i18n{cancel}
166 </paper-button> 167 </paper-button>
167 </template> 168 </template>
168 <template is="dom-if" if="[[isDialogType_('connectError', dialogId)]]"> 169 <template is="dom-if" if="[[isDialogType_('connectError', dialogId)]]">
169 <paper-button on-tap="close">$i18n{bluetoothDismiss} 170 <paper-button on-tap="close">$i18n{bluetoothDismiss}
170 </paper-button> 171 </paper-button>
171 </template> 172 </template>
172 </div> 173 </div>
173 </dialog> 174 </dialog>
174 </template> 175 </template>
175 <script src="/bluetooth_page/bluetooth_device_dialog.js"></script> 176 <script src="/bluetooth_page/bluetooth_device_dialog.js"></script>
176 </dom-module> 177 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698