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

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

Issue 2210933004: Settings Router Refactor: Kill settings-router. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix merge Created 4 years, 4 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/note.html"> 10 <link rel="import" href="/device_page/note.html">
11 <link rel="import" href="/device_page/pointers.html"> 11 <link rel="import" href="/device_page/pointers.html">
12 <link rel="import" href="/icons.html"> 12 <link rel="import" href="/icons.html">
13 <link rel="import" href="/prefs/prefs.html"> 13 <link rel="import" href="/prefs/prefs.html">
14 <link rel="import" href="/route.html"> 14 <link rel="import" href="/route.html">
15 <link rel="import" href="/settings_page/settings_animated_pages.html"> 15 <link rel="import" href="/settings_page/settings_animated_pages.html">
16 <link rel="import" href="/settings_page/settings_subpage.html"> 16 <link rel="import" href="/settings_page/settings_subpage.html">
17 <link rel="import" href="/settings_shared_css.html"> 17 <link rel="import" href="/settings_shared_css.html">
18 18
19 <dom-module id="settings-device-page"> 19 <dom-module id="settings-device-page">
20 <template> 20 <template>
21 <style include="settings-shared"></style> 21 <style include="settings-shared"></style>
22 <settings-animated-pages id="pages" section="device" 22 <settings-animated-pages id="pages" section="device">
23 current-route="{{currentRoute}}">
24 <neon-animatable id="main"> 23 <neon-animatable id="main">
25 <div id="pointersRow" class="settings-box first" 24 <div id="pointersRow" class="settings-box first"
26 on-tap="onPointersTap_" actionable> 25 on-tap="onPointersTap_" actionable>
27 <iron-icon icon="[[getPointersIcon_(hasMouse_, hasTouchpad_)]]"> 26 <iron-icon icon="[[getPointersIcon_(hasMouse_, hasTouchpad_)]]">
28 </iron-icon> 27 </iron-icon>
29 <div class="middle"> 28 <div class="middle">
30 [[getPointersTitle_(hasMouse_, hasTouchpad_)]] 29 [[getPointersTitle_(hasMouse_, hasTouchpad_)]]
31 </div> 30 </div>
32 </div> 31 </div>
33 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_" 32 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_"
(...skipping 28 matching lines...) Expand all
62 associated-control="[[$$('#keyboardRow')]]" 61 associated-control="[[$$('#keyboardRow')]]"
63 page-title="$i18n{keyboardTitle}"> 62 page-title="$i18n{keyboardTitle}">
64 <settings-keyboard prefs="{{prefs}}"></settings-keyboard> 63 <settings-keyboard prefs="{{prefs}}"></settings-keyboard>
65 </settings-subpage> 64 </settings-subpage>
66 </template> 65 </template>
67 <template is="dom-if" if=[[noteAllowed_]]> 66 <template is="dom-if" if=[[noteAllowed_]]>
68 <template is="dom-if" name="note"> 67 <template is="dom-if" name="note">
69 <settings-subpage 68 <settings-subpage
70 associated-control="[[$$('#noteRow')]]" 69 associated-control="[[$$('#noteRow')]]"
71 page-title="$i18n{noteTitle}"> 70 page-title="$i18n{noteTitle}">
72 <settings-note prefs="{{prefs}}" current-route="{{currentRoute}}"> 71 <settings-note prefs="{{prefs}}"></settings-note>
73 </settings-note>
74 </settings-subpage> 72 </settings-subpage>
75 </template> 73 </template>
76 </template> 74 </template>
77 <template is="dom-if" name="display"> 75 <template is="dom-if" name="display">
78 <settings-subpage 76 <settings-subpage
79 associated-control="[[$$('#displayRow')]]" 77 associated-control="[[$$('#displayRow')]]"
80 page-title="$i18n{displayTitle}"> 78 page-title="$i18n{displayTitle}">
81 <settings-display></settings-display> 79 <settings-display></settings-display>
82 </settings-subpage> 80 </settings-subpage>
83 </template> 81 </template>
84 </settings-animated-pages> 82 </settings-animated-pages>
85 </template> 83 </template>
86 <script src="device_page.js"></script> 84 <script src="device_page.js"></script>
87 </dom-module> 85 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698