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

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

Issue 2178213002: Add note page to settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@stylus-add-switch
Patch Set: Initial upload 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/pointers.html"> 11 <link rel="import" href="/device_page/pointers.html">
11 <link rel="import" href="/icons.html"> 12 <link rel="import" href="/icons.html">
12 <link rel="import" href="/prefs/prefs.html"> 13 <link rel="import" href="/prefs/prefs.html">
13 <link rel="import" href="/settings_page/settings_animated_pages.html"> 14 <link rel="import" href="/settings_page/settings_animated_pages.html">
14 <link rel="import" href="/settings_page/settings_subpage.html"> 15 <link rel="import" href="/settings_page/settings_subpage.html">
15 <link rel="import" href="/settings_shared_css.html"> 16 <link rel="import" href="/settings_shared_css.html">
16 17
17 <dom-module id="settings-device-page"> 18 <dom-module id="settings-device-page">
18 <template> 19 <template>
19 <style include="settings-shared"></style> 20 <style include="settings-shared"></style>
20 <settings-animated-pages id="pages" section="device" 21 <settings-animated-pages id="pages" section="device"
21 current-route="{{currentRoute}}"> 22 current-route="{{currentRoute}}">
22 <neon-animatable id="main"> 23 <neon-animatable id="main">
23 <div id="pointersRow" class="settings-box first" 24 <div id="pointersRow" class="settings-box first"
24 on-tap="onPointersTap_" actionable> 25 on-tap="onPointersTap_" actionable>
25 <iron-icon icon="[[getPointersIcon_(hasMouse_, hasTouchpad_)]]"> 26 <iron-icon icon="[[getPointersIcon_(hasMouse_, hasTouchpad_)]]">
26 </iron-icon> 27 </iron-icon>
27 <div class="middle"> 28 <div class="middle">
28 [[getPointersTitle_(hasMouse_, hasTouchpad_)]] 29 [[getPointersTitle_(hasMouse_, hasTouchpad_)]]
29 </div> 30 </div>
30 </div> 31 </div>
31 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_" 32 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_"
32 actionable> 33 actionable>
33 <iron-icon icon="settings:keyboard"></iron-icon> 34 <iron-icon icon="settings:keyboard"></iron-icon>
34 <div class="middle">$i18n{keyboardTitle}</div> 35 <div class="middle">$i18n{keyboardTitle}</div>
35 </div> 36 </div>
37 <template is="dom-if" if=[[noteAllowed_]]>
38 <div id="noteRow" class="settings-box" on-tap="onNoteTap_"
stevenjb 2016/07/26 23:21:39 id not needed?
jdufault 2016/07/27 20:55:01 Done.
39 actionable>
40 <iron-icon icon="settings:note"></iron-icon>
41 <!-- TODO(jdufault): i18n -->
42 <div class="middle">Note</div>
stevenjb 2016/07/26 23:21:39 We should do i18n now, it's easy to miss something
jdufault 2016/07/27 20:55:01 Done.
43 </div>
44 </template>
36 <div id="displayRow" class="settings-box" on-tap="onDisplayTap_" 45 <div id="displayRow" class="settings-box" on-tap="onDisplayTap_"
37 actionable> 46 actionable>
38 <iron-icon icon="settings:desktop-windows"></iron-icon> 47 <iron-icon icon="settings:desktop-windows"></iron-icon>
39 <div class="middle">$i18n{displayTitle}</div> 48 <div class="middle">$i18n{displayTitle}</div>
40 </div> 49 </div>
41 </neon-animatable> 50 </neon-animatable>
42 <template is="dom-if" name="pointers"> 51 <template is="dom-if" name="pointers">
43 <settings-subpage 52 <settings-subpage
44 page-title="[[getPointersTitle_(hasMouse_, hasTouchpad_)]]"> 53 page-title="[[getPointersTitle_(hasMouse_, hasTouchpad_)]]">
45 <settings-pointers prefs="{{prefs}}" 54 <settings-pointers prefs="{{prefs}}"
46 has-mouse="[[hasMouse_]]" has-touchpad="[[hasTouchpad_]]"> 55 has-mouse="[[hasMouse_]]" has-touchpad="[[hasTouchpad_]]">
47 </settings-pointers> 56 </settings-pointers>
48 </settings-subpage> 57 </settings-subpage>
49 </template> 58 </template>
50 <template is="dom-if" name="keyboard"> 59 <template is="dom-if" name="keyboard">
51 <settings-subpage page-title="$i18n{keyboardTitle}"> 60 <settings-subpage page-title="$i18n{keyboardTitle}">
52 <settings-keyboard prefs="{{prefs}}" current-route="{{currentRoute}}"> 61 <settings-keyboard prefs="{{prefs}}" current-route="{{currentRoute}}">
53 </settings-keyboard> 62 </settings-keyboard>
54 </settings-subpage> 63 </settings-subpage>
55 </template> 64 </template>
65 <template is="dom-if" name="note">
stevenjb 2016/07/26 23:21:39 if=?
jdufault 2016/07/27 20:55:01 Done. I've added it in another <template> wrapper,
66 <!-- TODO(jdufault): i18n -->
67 <settings-subpage page-title="Notes">
68 <settings-note prefs="{{prefs}}" current-route="{{currentRoute}}">
69 </settings-note>
70 </settings-subpage>
71 </template>
56 <template is="dom-if" name="display"> 72 <template is="dom-if" name="display">
57 <settings-subpage page-title="$i18n{displayTitle}"> 73 <settings-subpage page-title="$i18n{displayTitle}">
58 <settings-display></settings-display> 74 <settings-display></settings-display>
59 </settings-subpage> 75 </settings-subpage>
60 </template> 76 </template>
61 </settings-animated-pages> 77 </settings-animated-pages>
62 </template> 78 </template>
63 <script src="device_page.js"></script> 79 <script src="device_page.js"></script>
64 </dom-module> 80 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698