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

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

Issue 2348913002: Port storage manager to MD settings. (Closed)
Patch Set: histograms.xml 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="/controls/settings_dropdown_menu.html"> 6 <link rel="import" href="/controls/settings_dropdown_menu.html">
7 <link rel="import" href="/device_page/device_page_browser_proxy.html"> 7 <link rel="import" href="/device_page/device_page_browser_proxy.html">
8 <link rel="import" href="/device_page/display.html"> 8 <link rel="import" href="/device_page/display.html">
9 <link rel="import" href="/device_page/keyboard.html"> 9 <link rel="import" href="/device_page/keyboard.html">
10 <link rel="import" href="/device_page/pointers.html">
11 <link rel="import" href="/device_page/storage.html">
10 <link rel="import" href="/device_page/stylus.html"> 12 <link rel="import" href="/device_page/stylus.html">
11 <link rel="import" href="/device_page/pointers.html">
12 <link rel="import" href="/icons.html"> 13 <link rel="import" href="/icons.html">
13 <link rel="import" href="/prefs/prefs.html"> 14 <link rel="import" href="/prefs/prefs.html">
14 <link rel="import" href="/route.html"> 15 <link rel="import" href="/route.html">
15 <link rel="import" href="/settings_page/settings_animated_pages.html"> 16 <link rel="import" href="/settings_page/settings_animated_pages.html">
16 <link rel="import" href="/settings_page/settings_subpage.html"> 17 <link rel="import" href="/settings_page/settings_subpage.html">
17 <link rel="import" href="/settings_shared_css.html"> 18 <link rel="import" href="/settings_shared_css.html">
18 19
19 <dom-module id="settings-device-page"> 20 <dom-module id="settings-device-page">
20 <template> 21 <template>
21 <style include="settings-shared"></style> 22 <style include="settings-shared"></style>
(...skipping 17 matching lines...) Expand all
39 actionable> 40 actionable>
40 <iron-icon icon="settings:note"></iron-icon> 41 <iron-icon icon="settings:note"></iron-icon>
41 <div class="middle">$i18n{stylusTitle}</div> 42 <div class="middle">$i18n{stylusTitle}</div>
42 </div> 43 </div>
43 </template> 44 </template>
44 <div id="displayRow" class="settings-box" on-tap="onDisplayTap_" 45 <div id="displayRow" class="settings-box" on-tap="onDisplayTap_"
45 actionable> 46 actionable>
46 <iron-icon icon="settings:desktop-windows"></iron-icon> 47 <iron-icon icon="settings:desktop-windows"></iron-icon>
47 <div class="middle">$i18n{displayTitle}</div> 48 <div class="middle">$i18n{displayTitle}</div>
48 </div> 49 </div>
50 <template is="dom-if" if=[[showStorageManager_]]>
michaelpg 2016/10/01 01:41:04 quotes around attributes
fukino 2016/10/03 18:40:41 Done. I did the same fix for stylusAllowed_ too.
51 <div id="storageRow" class="settings-box" on-tap="onStorageTap_"
52 actionable>
53 <iron-icon icon="settings:storage"></iron-icon>
54 <div class="middle">$i18n{storageTitle}</div>
55 </div>
56 </template>
49 </neon-animatable> 57 </neon-animatable>
50 <template is="dom-if" route-path="/pointer-overlay"> 58 <template is="dom-if" route-path="/pointer-overlay">
51 <settings-subpage 59 <settings-subpage
52 associated-control="[[$$('#pointersRow')]]" 60 associated-control="[[$$('#pointersRow')]]"
53 page-title="[[getPointersTitle_(hasMouse_, hasTouchpad_)]]"> 61 page-title="[[getPointersTitle_(hasMouse_, hasTouchpad_)]]">
54 <settings-pointers prefs="{{prefs}}" 62 <settings-pointers prefs="{{prefs}}"
55 has-mouse="[[hasMouse_]]" has-touchpad="[[hasTouchpad_]]"> 63 has-mouse="[[hasMouse_]]" has-touchpad="[[hasTouchpad_]]">
56 </settings-pointers> 64 </settings-pointers>
57 </settings-subpage> 65 </settings-subpage>
58 </template> 66 </template>
(...skipping 13 matching lines...) Expand all
72 </settings-subpage> 80 </settings-subpage>
73 </template> 81 </template>
74 </template> 82 </template>
75 <template is="dom-if" route-path="/display"> 83 <template is="dom-if" route-path="/display">
76 <settings-subpage 84 <settings-subpage
77 associated-control="[[$$('#displayRow')]]" 85 associated-control="[[$$('#displayRow')]]"
78 page-title="$i18n{displayTitle}"> 86 page-title="$i18n{displayTitle}">
79 <settings-display></settings-display> 87 <settings-display></settings-display>
80 </settings-subpage> 88 </settings-subpage>
81 </template> 89 </template>
90 <template is="dom-if" if=[[showStorageManager_]]>
michaelpg 2016/10/01 01:41:04 quotes
fukino 2016/10/03 18:40:41 Done.
91 <template is="dom-if" route-path="/storage">
92 <settings-subpage
93 associated-control="[[$$('#storageRow')]]"
94 page-title="$i18n{storageTitle}">
95 <settings-storage></settings-storage>
96 </settings-subpage>
97 </template>
98 </template>
82 </settings-animated-pages> 99 </settings-animated-pages>
83 </template> 100 </template>
84 <script src="device_page.js"></script> 101 <script src="device_page.js"></script>
85 </dom-module> 102 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698