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

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

Issue 2348913002: Port storage manager to MD settings. (Closed)
Patch Set: Address review comments. Created 4 years, 2 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/html/web_ui_listener_behavior.html"> 3 <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"> 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/neon-animation/neon-ani matable.html"> 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/paper-icon-button/paper -icon-button-light.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html">
7 <link rel="import" href="/controls/settings_dropdown_menu.html"> 7 <link rel="import" href="/controls/settings_dropdown_menu.html">
8 <link rel="import" href="/device_page/device_page_browser_proxy.html"> 8 <link rel="import" href="/device_page/device_page_browser_proxy.html">
9 <link rel="import" href="/device_page/display.html"> 9 <link rel="import" href="/device_page/display.html">
10 <link rel="import" href="/device_page/keyboard.html"> 10 <link rel="import" href="/device_page/keyboard.html">
11 <link rel="import" href="/device_page/pointers.html">
12 <link rel="import" href="/device_page/storage.html">
11 <link rel="import" href="/device_page/stylus.html"> 13 <link rel="import" href="/device_page/stylus.html">
12 <link rel="import" href="/device_page/pointers.html">
13 <link rel="import" href="/icons.html"> 14 <link rel="import" href="/icons.html">
14 <link rel="import" href="/prefs/prefs.html"> 15 <link rel="import" href="/prefs/prefs.html">
15 <link rel="import" href="/route.html"> 16 <link rel="import" href="/route.html">
16 <link rel="import" href="/settings_page/settings_animated_pages.html"> 17 <link rel="import" href="/settings_page/settings_animated_pages.html">
17 <link rel="import" href="/settings_page/settings_subpage.html"> 18 <link rel="import" href="/settings_page/settings_subpage.html">
18 <link rel="import" href="/settings_shared_css.html"> 19 <link rel="import" href="/settings_shared_css.html">
19 20
20 <dom-module id="settings-device-page"> 21 <dom-module id="settings-device-page">
21 <template> 22 <template>
22 <style include="settings-shared"></style> 23 <style include="settings-shared"></style>
23 <settings-animated-pages id="pages" section="device"> 24 <settings-animated-pages id="pages" section="device">
24 <neon-animatable id="main" route-path="default"> 25 <neon-animatable id="main" route-path="default">
25 <div id="pointersRow" class="settings-box first" 26 <div id="pointersRow" class="settings-box first"
26 on-tap="onPointersTap_" actionable> 27 on-tap="onPointersTap_" actionable>
27 <iron-icon icon="[[getPointersIcon_(hasMouse_, hasTouchpad_)]]"> 28 <iron-icon icon="[[getPointersIcon_(hasMouse_, hasTouchpad_)]]">
28 </iron-icon> 29 </iron-icon>
29 <div class="middle"> 30 <div class="middle">
30 [[getPointersTitle_(hasMouse_, hasTouchpad_)]] 31 [[getPointersTitle_(hasMouse_, hasTouchpad_)]]
31 </div> 32 </div>
32 <button class="icon-arrow-right" is="paper-icon-button-light"> 33 <button class="icon-arrow-right" is="paper-icon-button-light">
33 </button> 34 </button>
34 </div> 35 </div>
35 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_" 36 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_"
36 actionable> 37 actionable>
37 <iron-icon icon="settings:keyboard"></iron-icon> 38 <iron-icon icon="settings:keyboard"></iron-icon>
38 <div class="middle">$i18n{keyboardTitle}</div> 39 <div class="middle">$i18n{keyboardTitle}</div>
39 <button class="icon-arrow-right" is="paper-icon-button-light"> 40 <button class="icon-arrow-right" is="paper-icon-button-light">
40 </button> 41 </button>
41 </div> 42 </div>
42 <template is="dom-if" if=[[stylusAllowed_]]> 43 <template is="dom-if" if="[[stylusAllowed_]]">
43 <div id="stylusRow" class="settings-box" on-tap="onStylusTap_" 44 <div id="stylusRow" class="settings-box" on-tap="onStylusTap_"
44 actionable> 45 actionable>
45 <iron-icon icon="settings:note"></iron-icon> 46 <iron-icon icon="settings:note"></iron-icon>
46 <div class="middle">$i18n{stylusTitle}</div> 47 <div class="middle">$i18n{stylusTitle}</div>
47 <button class="icon-arrow-right" is="paper-icon-button-light"> 48 <button class="icon-arrow-right" is="paper-icon-button-light">
48 </button> 49 </button>
49 </div> 50 </div>
50 </template> 51 </template>
51 <div id="displayRow" class="settings-box" on-tap="onDisplayTap_" 52 <div id="displayRow" class="settings-box" on-tap="onDisplayTap_"
52 actionable> 53 actionable>
53 <iron-icon icon="settings:desktop-windows"></iron-icon> 54 <iron-icon icon="settings:desktop-windows"></iron-icon>
54 <div class="middle">$i18n{displayTitle}</div> 55 <div class="middle">$i18n{displayTitle}</div>
55 <button class="icon-arrow-right" is="paper-icon-button-light"> 56 <button class="icon-arrow-right" is="paper-icon-button-light">
56 </button> 57 </button>
57 </div> 58 </div>
59 <template is="dom-if" if="[[showStorageManager_]]">
60 <div id="storageRow" class="settings-box" on-tap="onStorageTap_"
61 actionable>
62 <iron-icon icon="settings:storage"></iron-icon>
63 <div class="middle">$i18n{storageTitle}</div>
michaelpg 2016/10/03 23:44:45 Rebase issue: add the icon-arrow-right button here
fukino 2016/10/04 09:03:53 Done.
64 </div>
65 </template>
58 </neon-animatable> 66 </neon-animatable>
59 <template is="dom-if" route-path="/pointer-overlay"> 67 <template is="dom-if" route-path="/pointer-overlay">
60 <settings-subpage 68 <settings-subpage
61 associated-control="[[$$('#pointersRow')]]" 69 associated-control="[[$$('#pointersRow')]]"
62 page-title="[[getPointersTitle_(hasMouse_, hasTouchpad_)]]"> 70 page-title="[[getPointersTitle_(hasMouse_, hasTouchpad_)]]">
63 <settings-pointers prefs="{{prefs}}" 71 <settings-pointers prefs="{{prefs}}"
64 has-mouse="[[hasMouse_]]" has-touchpad="[[hasTouchpad_]]"> 72 has-mouse="[[hasMouse_]]" has-touchpad="[[hasTouchpad_]]">
65 </settings-pointers> 73 </settings-pointers>
66 </settings-subpage> 74 </settings-subpage>
67 </template> 75 </template>
68 <template is="dom-if" route-path="/keyboard-overlay"> 76 <template is="dom-if" route-path="/keyboard-overlay">
69 <settings-subpage 77 <settings-subpage
70 associated-control="[[$$('#keyboardRow')]]" 78 associated-control="[[$$('#keyboardRow')]]"
71 page-title="$i18n{keyboardTitle}"> 79 page-title="$i18n{keyboardTitle}">
72 <settings-keyboard prefs="{{prefs}}"></settings-keyboard> 80 <settings-keyboard prefs="{{prefs}}"></settings-keyboard>
73 </settings-subpage> 81 </settings-subpage>
74 </template> 82 </template>
75 <template is="dom-if" if=[[stylusAllowed_]]> 83 <template is="dom-if" if="[[stylusAllowed_]]">
76 <template is="dom-if" route-path="/stylus"> 84 <template is="dom-if" route-path="/stylus">
77 <settings-subpage 85 <settings-subpage
78 associated-control="[[$$('#stylusRow')]]" 86 associated-control="[[$$('#stylusRow')]]"
79 page-title="$i18n{stylusTitle}"> 87 page-title="$i18n{stylusTitle}">
80 <settings-stylus prefs="{{prefs}}"></settings-stylus> 88 <settings-stylus prefs="{{prefs}}"></settings-stylus>
81 </settings-subpage> 89 </settings-subpage>
82 </template> 90 </template>
83 </template> 91 </template>
84 <template is="dom-if" route-path="/display"> 92 <template is="dom-if" route-path="/display">
85 <settings-subpage 93 <settings-subpage
86 associated-control="[[$$('#displayRow')]]" 94 associated-control="[[$$('#displayRow')]]"
87 page-title="$i18n{displayTitle}"> 95 page-title="$i18n{displayTitle}">
88 <settings-display></settings-display> 96 <settings-display></settings-display>
89 </settings-subpage> 97 </settings-subpage>
90 </template> 98 </template>
99 <template is="dom-if" if="[[showStorageManager_]]">
100 <template is="dom-if" route-path="/storage">
101 <settings-subpage
102 associated-control="[[$$('#storageRow')]]"
103 page-title="$i18n{storageTitle}">
104 <settings-storage></settings-storage>
105 </settings-subpage>
106 </template>
107 </template>
91 </settings-animated-pages> 108 </settings-animated-pages>
92 </template> 109 </template>
93 <script src="device_page.js"></script> 110 <script src="device_page.js"></script>
94 </dom-module> 111 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698