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

Side by Side Diff: chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.html

Issue 2452833002: [CUPS] MD Settings: Migrate from paper-dropdown-menu-light to native select (Closed)
Patch Set: Created 4 years, 1 month 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
« no previous file with comments | « no previous file | chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.js » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 2 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dropdown-menu/pap er-dropdown-menu-light.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html"> 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input .html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html"> 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-spinner/paper-spi nner.html">
6 <link rel="import" href="/i18n_setup.html"> 5 <link rel="import" href="/i18n_setup.html">
6 <link rel="import" href="/md_select_css.html">
7 <link rel="import" href="/printing_page/cups_add_printer_dialog_util.html"> 7 <link rel="import" href="/printing_page/cups_add_printer_dialog_util.html">
8 <link rel="import" href="/printing_page/cups_printers_browser_proxy.html"> 8 <link rel="import" href="/printing_page/cups_printers_browser_proxy.html">
9 <link rel="import" href="/settings_shared_css.html"> 9 <link rel="import" href="/settings_shared_css.html">
10 10
11 <dom-module id="add-printer-discovery-dialog"> 11 <dom-module id="add-printer-discovery-dialog">
12 <template> 12 <template>
13 <style include="settings-shared"> 13 <style include="settings-shared">
dpapad 2016/10/26 00:03:05 The md-select styling is not applied unless you mo
stevenjb 2016/10/26 00:05:19 There are two dom-module instances in this file, m
dpapad 2016/10/26 00:05:24 Ok, ignore my comment. I got confused by the multi
14 add-printer-list { 14 add-printer-list {
15 max-height: 310px; 15 max-height: 310px;
16 overflow-y: auto; 16 overflow-y: auto;
17 position: absolute; 17 position: absolute;
18 width: 100%; 18 width: 100%;
19 } 19 }
20 20
21 .dialog-body .center { 21 .dialog-body .center {
22 display: flex; 22 display: flex;
23 justify-content: center; 23 justify-content: center;
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 disabled="[[!selectedPrinter]]" on-tap="switchToConfiguringDialog_"> 68 disabled="[[!selectedPrinter]]" on-tap="switchToConfiguringDialog_">
69 $i18n{addPrinterButtonText} 69 $i18n{addPrinterButtonText}
70 </paper-button> 70 </paper-button>
71 </div> 71 </div>
72 </add-printer-dialog> 72 </add-printer-dialog>
73 </template> 73 </template>
74 </dom-module> 74 </dom-module>
75 75
76 <dom-module id="add-printer-maually-dialog"> 76 <dom-module id="add-printer-maually-dialog">
77 <template> 77 <template>
78 <style include="settings-shared"> 78 <style include="settings-shared md-select">
79 #discoverPrintersButton { 79 #discoverPrintersButton {
80 -webkit-margin-end: 153px; 80 -webkit-margin-end: 153px;
81 } 81 }
82 82
83 .settings-box { 83 .settings-box {
84 border-top: none; 84 border-top: none;
85 } 85 }
86 86
87 .settings-box.two-line { 87 .settings-box.two-line {
88 min-height: 72px; 88 min-height: 72px;
(...skipping 62 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 value="{{newPrinter.printerAddress}}" 151 value="{{newPrinter.printerAddress}}"
152 on-input="onAddressChanged_"> 152 on-input="onAddressChanged_">
153 </paper-input> 153 </paper-input>
154 </div> 154 </div>
155 </div> 155 </div>
156 </div> 156 </div>
157 <div class="settings-box two-line"> 157 <div class="settings-box two-line">
158 <div class="start"> 158 <div class="start">
159 <div class="label">$i18n{printerProtocol}</div> 159 <div class="label">$i18n{printerProtocol}</div>
160 <div class="secondary"> 160 <div class="secondary">
161 <paper-dropdown-menu-light no-label-float> 161 <div class="md-select-wrapper">
162 <paper-listbox class="dropdown-content" 162 <select class="md-select"
163 selected="{{newPrinter.printerProtocol}}" 163 value="[[newPrinter.printerProtocol]]"
164 attr-for-selected="value"> 164 on-change="onProtocolChange_">
165 <paper-item value="ipp"> 165 <option value="ipp">$i18n{printerProtocolIpp}</option>
166 $i18n{printerProtocolIpp} 166 <option value="ipps">$i18n{printerProtocolIpps}</option>
167 </paper-item> 167 <option value="http">$i18n{printerProtocolHttp}</option>
168 <paper-item value="ipps"> 168 <option value="https">$i18n{printerProtocolHttps}</option>
169 $i18n{printerProtocolIpps} 169 <option value="socket">$i18n{printerProtocolAppSocket}
170 </paper-item> 170 </option>
171 <paper-item value="http"> 171 <option value="lpd">$i18n{printerProtocolLpd}</option>
172 $i18n{printerProtocolHttp} 172 <option value="usb">$i18n{printerProtocolUsb}</option>
173 </paper-item> 173 </select>
174 <paper-item value="https"> 174 <span class="md-select-underline"></span>
175 $i18n{printerProtocolHttps} 175 </div>
176 </paper-item>
177 <paper-item value="socket">
178 $i18n{printerProtocolAppSocket}
179 </paper-item>
180 <paper-item value="lpd">$i18n{printerProtocolLpd}</paper-item>
181 <paper-item value="usb">$i18n{printerProtocolUsb}</paper-item>
182 </paper-listbox>
183 </paper-dropdown-menu-light>
184 </div> 176 </div>
185 </div> 177 </div>
186 </div> 178 </div>
187 <div class="settings-box two-line"> 179 <div class="settings-box two-line">
188 <div class="start"> 180 <div class="start">
189 <div class="label">$i18n{printerQueue}</div> 181 <div class="label">$i18n{printerQueue}</div>
190 <div class="secondary"> 182 <div class="secondary">
191 <paper-input no-label-float value="{{newPrinter.printerQueue}}"> 183 <paper-input no-label-float value="{{newPrinter.printerQueue}}">
192 </paper-input> 184 </paper-input>
193 </div> 185 </div>
(...skipping 181 matching lines...) Expand 10 before | Expand all | Expand 10 after
375 <!-- Manufacturer and Model Dialog --> 367 <!-- Manufacturer and Model Dialog -->
376 <template is="dom-if" if="[[showManufacturerDialog_]]" restamp> 368 <template is="dom-if" if="[[showManufacturerDialog_]]" restamp>
377 <add-printer-manufacturer-model-dialog new-printer="{{newPrinter}}" 369 <add-printer-manufacturer-model-dialog new-printer="{{newPrinter}}"
378 setup-failed="[[setupFailed]]"> 370 setup-failed="[[setupFailed]]">
379 </add-printer-manufacturer-model-dialog> 371 </add-printer-manufacturer-model-dialog>
380 </template> 372 </template>
381 373
382 </template> 374 </template>
383 <script src="cups_add_printer_dialog.js"></script> 375 <script src="cups_add_printer_dialog.js"></script>
384 </dom-module> 376 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/resources/settings/printing_page/cups_add_printer_dialog.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698