Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/iron-icon/iron-icon.htm l"> | |
| 3 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> | 2 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> |
| 4 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | 3 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> |
| 5 <link rel="import" href="/icons.html"> | |
| 6 <link rel="import" href="/printing_page/cloud_printers.html"> | 4 <link rel="import" href="/printing_page/cloud_printers.html"> |
| 7 <link rel="import" href="/route.html"> | 5 <link rel="import" href="/route.html"> |
| 8 <link rel="import" href="/settings_page/settings_animated_pages.html"> | 6 <link rel="import" href="/settings_page/settings_animated_pages.html"> |
| 9 <link rel="import" href="/settings_page/settings_subpage.html"> | 7 <link rel="import" href="/settings_page/settings_subpage.html"> |
| 10 <link rel="import" href="/settings_shared_css.html"> | 8 <link rel="import" href="/settings_shared_css.html"> |
| 11 <if expr="chromeos"> | 9 <if expr="chromeos"> |
| 12 <link rel="import" href="/printing_page/cups_printer_details_page.html"> | 10 <link rel="import" href="/printing_page/cups_printer_details_page.html"> |
| 13 <link rel="import" href="/printing_page/cups_printers.html"> | 11 <link rel="import" href="/printing_page/cups_printers.html"> |
| 14 </if> | 12 </if> |
| 15 | 13 |
| 16 <dom-module id="settings-printing-page"> | 14 <dom-module id="settings-printing-page"> |
| 17 <template> | 15 <template> |
| 18 <style include="settings-shared"></style> | 16 <style include="settings-shared"></style> |
| 19 <settings-animated-pages id="pages" section="printing"> | 17 <settings-animated-pages id="pages" section="printing"> |
| 20 <array-selector id="arraySelector" items="{{cupsPrinters}}" | 18 <array-selector id="arraySelector" items="{{cupsPrinters}}" |
| 21 selected="{{detailPrinter_}}"> | 19 selected="{{detailPrinter_}}"> |
| 22 </array-selector> | 20 </array-selector> |
| 23 <neon-animatable route-path="default"> | 21 <neon-animatable route-path="default"> |
| 24 <if expr="chromeos"> | 22 <if expr="chromeos"> |
| 25 <template is="dom-if" if="[[showCupsPrintingFeatures_]]"> | 23 <template is="dom-if" if="[[showCupsPrintingFeatures_]]"> |
| 26 <div id="cupsPrinters" class="settings-box first" | 24 <div id="cupsPrinters" class="settings-box first" |
| 27 on-tap="onTapCupsPrinters_" actionable> | 25 on-tap="onTapCupsPrinters_" actionable> |
| 28 <iron-icon icon="cr:print"></iron-icon> | 26 <div class="start"> |
|
dschuyler
2016/10/10 21:04:43
I didn't remove the cr:print icon from the icons f
| |
| 29 <div class="middle">$i18n{cupsPrintersTitle}</div> | 27 $i18n{cupsPrintersTitle} |
| 28 </div> | |
| 29 <button class="icon-arrow-right" is="paper-icon-button-light"> | |
| 30 </button> | |
|
dschuyler
2016/10/10 21:04:43
I added the icon-arrow-right because I was here. I
| |
| 30 </div> | 31 </div> |
| 31 </template> | 32 </template> |
| 32 </if> | 33 </if> |
| 33 <div id="cloudPrinters" class="settings-box two-line" | 34 <div id="cloudPrinters" class="settings-box two-line" |
| 34 on-tap="onTapCloudPrinters_" actionable> | 35 on-tap="onTapCloudPrinters_" actionable> |
| 35 <iron-icon icon="settings:cloud-printing"></iron-icon> | 36 <div class="start"> |
| 36 <div class="middle"> | |
| 37 $i18n{cloudPrintersTitle} | 37 $i18n{cloudPrintersTitle} |
| 38 <div class="secondary">$i18n{cloudPrintersTitleDescription}</div> | 38 <div class="secondary">$i18n{cloudPrintersTitleDescription}</div> |
| 39 </div> | 39 </div> |
| 40 <button class="icon-arrow-right" is="paper-icon-button-light"> | 40 <button class="icon-arrow-right" is="paper-icon-button-light"> |
| 41 </button> | 41 </button> |
| 42 </div> | 42 </div> |
| 43 </neon-animatable> | 43 </neon-animatable> |
| 44 <if expr="chromeos"> | 44 <if expr="chromeos"> |
| 45 <template is="dom-if" route-path="/cupsPrinters"> | 45 <template is="dom-if" route-path="/cupsPrinters"> |
| 46 <settings-subpage | 46 <settings-subpage |
| (...skipping 18 matching lines...) Expand all Loading... | |
| 65 associated-control="[[$$('#cloudPrinters')]]" | 65 associated-control="[[$$('#cloudPrinters')]]" |
| 66 page-title="$i18n{cloudPrintersTitle}"> | 66 page-title="$i18n{cloudPrintersTitle}"> |
| 67 <settings-cloud-printers prefs="{{prefs}}"> | 67 <settings-cloud-printers prefs="{{prefs}}"> |
| 68 </settings-cloud-printers> | 68 </settings-cloud-printers> |
| 69 </settings-subpage> | 69 </settings-subpage> |
| 70 </template> | 70 </template> |
| 71 </settings-animated-pages> | 71 </settings-animated-pages> |
| 72 </template> | 72 </template> |
| 73 <script src="printing_page.js"></script> | 73 <script src="printing_page.js"></script> |
| 74 </dom-module> | 74 </dom-module> |
| OLD | NEW |