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

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

Issue 2615673003: [MD WebUI] Move icons used in Bookmarks and Settings to shared file. (Closed)
Patch Set: reorder some icons Created 3 years, 11 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/html/i18n_behavior.html"> 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/cr_elements/icons.html">
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.htm l">
5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
7 <link rel="import" href="/device_page/device_page_browser_proxy.html"> 8 <link rel="import" href="/device_page/device_page_browser_proxy.html">
8 <link rel="import" href="/device_page/display.html"> 9 <link rel="import" href="/device_page/display.html">
9 <link rel="import" href="/device_page/keyboard.html"> 10 <link rel="import" href="/device_page/keyboard.html">
10 <link rel="import" href="/device_page/pointers.html"> 11 <link rel="import" href="/device_page/pointers.html">
11 <link rel="import" href="/device_page/storage.html"> 12 <link rel="import" href="/device_page/storage.html">
12 <link rel="import" href="/device_page/stylus.html"> 13 <link rel="import" href="/device_page/stylus.html">
13 <link rel="import" href="/icons.html">
14 <link rel="import" href="/prefs/prefs.html"> 14 <link rel="import" href="/prefs/prefs.html">
15 <link rel="import" href="/route.html"> 15 <link rel="import" href="/route.html">
16 <link rel="import" href="/settings_page/settings_animated_pages.html"> 16 <link rel="import" href="/settings_page/settings_animated_pages.html">
17 <link rel="import" href="/settings_page/settings_subpage.html"> 17 <link rel="import" href="/settings_page/settings_subpage.html">
18 <link rel="import" href="/settings_shared_css.html"> 18 <link rel="import" href="/settings_shared_css.html">
19 19
20 <dom-module id="settings-device-page"> 20 <dom-module id="settings-device-page">
21 <template> 21 <template>
22 <style include="settings-shared"></style> 22 <style include="settings-shared"></style>
23 <settings-animated-pages id="pages" section="device"> 23 <settings-animated-pages id="pages" section="device">
24 <neon-animatable id="main" route-path="default"> 24 <neon-animatable id="main" route-path="default">
25 <div id="pointersRow" class="settings-box first" 25 <div id="pointersRow" class="settings-box first"
26 on-tap="onPointersTap_" actionable> 26 on-tap="onPointersTap_" actionable>
27 <iron-icon icon="[[getPointersIcon_(hasMouse_, hasTouchpad_)]]"> 27 <iron-icon icon="[[getPointersIcon_(hasMouse_, hasTouchpad_)]]">
28 </iron-icon> 28 </iron-icon>
29 <div class="middle"> 29 <div class="middle">
30 [[getPointersTitle_(hasMouse_, hasTouchpad_)]] 30 [[getPointersTitle_(hasMouse_, hasTouchpad_)]]
31 </div> 31 </div>
32 <button class="subpage-arrow" is="paper-icon-button-light"></button> 32 <button class="subpage-arrow" is="paper-icon-button-light"></button>
33 </div> 33 </div>
34 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_" 34 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_"
35 actionable> 35 actionable>
36 <iron-icon icon="settings:keyboard"></iron-icon> 36 <iron-icon icon="cr:keyboard"></iron-icon>
37 <div class="middle">$i18n{keyboardTitle}</div> 37 <div class="middle">$i18n{keyboardTitle}</div>
38 <button class="subpage-arrow" is="paper-icon-button-light"></button> 38 <button class="subpage-arrow" is="paper-icon-button-light"></button>
39 </div> 39 </div>
40 <template is="dom-if" if="[[stylusAllowed_]]"> 40 <template is="dom-if" if="[[stylusAllowed_]]">
41 <div id="stylusRow" class="settings-box" on-tap="onStylusTap_" 41 <div id="stylusRow" class="settings-box" on-tap="onStylusTap_"
42 actionable> 42 actionable>
43 <iron-icon icon="settings:note"></iron-icon> 43 <iron-icon icon="cr:note"></iron-icon>
44 <div class="middle">$i18n{stylusTitle}</div> 44 <div class="middle">$i18n{stylusTitle}</div>
45 <button class="subpage-arrow" is="paper-icon-button-light"></button> 45 <button class="subpage-arrow" is="paper-icon-button-light"></button>
46 </div> 46 </div>
47 </template> 47 </template>
48 <div id="displayRow" class="settings-box" on-tap="onDisplayTap_" 48 <div id="displayRow" class="settings-box" on-tap="onDisplayTap_"
49 actionable> 49 actionable>
50 <iron-icon icon="settings:desktop-windows"></iron-icon> 50 <iron-icon icon="cr:desktop-windows"></iron-icon>
51 <div class="middle">$i18n{displayTitle}</div> 51 <div class="middle">$i18n{displayTitle}</div>
52 <button class="subpage-arrow" is="paper-icon-button-light"></button> 52 <button class="subpage-arrow" is="paper-icon-button-light"></button>
53 </div> 53 </div>
54 <div id="storageRow" class="settings-box" on-tap="onStorageTap_" 54 <div id="storageRow" class="settings-box" on-tap="onStorageTap_"
55 actionable> 55 actionable>
56 <iron-icon icon="settings:storage"></iron-icon> 56 <iron-icon icon="cr:storage"></iron-icon>
57 <div class="middle">$i18n{storageTitle}</div> 57 <div class="middle">$i18n{storageTitle}</div>
58 <button class="subpage-arrow" is="paper-icon-button-light"></button> 58 <button class="subpage-arrow" is="paper-icon-button-light"></button>
59 </div> 59 </div>
60 </neon-animatable> 60 </neon-animatable>
61 <template is="dom-if" route-path="/pointer-overlay"> 61 <template is="dom-if" route-path="/pointer-overlay">
62 <settings-subpage 62 <settings-subpage
63 associated-control="[[$$('#pointersRow')]]" 63 associated-control="[[$$('#pointersRow')]]"
64 page-title="[[getPointersTitle_(hasMouse_, hasTouchpad_)]]"> 64 page-title="[[getPointersTitle_(hasMouse_, hasTouchpad_)]]">
65 <settings-pointers prefs="{{prefs}}" 65 <settings-pointers prefs="{{prefs}}"
66 has-mouse="[[hasMouse_]]" has-touchpad="[[hasTouchpad_]]"> 66 has-mouse="[[hasMouse_]]" has-touchpad="[[hasTouchpad_]]">
(...skipping 27 matching lines...) Expand all
94 <settings-subpage 94 <settings-subpage
95 associated-control="[[$$('#storageRow')]]" 95 associated-control="[[$$('#storageRow')]]"
96 page-title="$i18n{storageTitle}"> 96 page-title="$i18n{storageTitle}">
97 <settings-storage></settings-storage> 97 <settings-storage></settings-storage>
98 </settings-subpage> 98 </settings-subpage>
99 </template> 99 </template>
100 </settings-animated-pages> 100 </settings-animated-pages>
101 </template> 101 </template>
102 <script src="device_page.js"></script> 102 <script src="device_page.js"></script>
103 </dom-module> 103 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698