| OLD | NEW |
| 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"> |
| (...skipping 18 matching lines...) Expand all Loading... |
| 29 <div class="middle"> | 29 <div class="middle"> |
| 30 [[getPointersTitle_(hasMouse_, hasTouchpad_)]] | 30 [[getPointersTitle_(hasMouse_, hasTouchpad_)]] |
| 31 </div> | 31 </div> |
| 32 </div> | 32 </div> |
| 33 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_" | 33 <div id="keyboardRow" class="settings-box" on-tap="onKeyboardTap_" |
| 34 actionable> | 34 actionable> |
| 35 <iron-icon icon="settings:keyboard"></iron-icon> | 35 <iron-icon icon="settings:keyboard"></iron-icon> |
| 36 <div class="middle">$i18n{keyboardTitle}</div> | 36 <div class="middle">$i18n{keyboardTitle}</div> |
| 37 </div> | 37 </div> |
| 38 <template is="dom-if" if=[[noteAllowed_]]> | 38 <template is="dom-if" if=[[noteAllowed_]]> |
| 39 <div class="settings-box" on-tap="onNoteTap_" | 39 <div id="noteRow" class="settings-box" on-tap="onNoteTap_" |
| 40 actionable> | 40 actionable> |
| 41 <iron-icon icon="settings:note"></iron-icon> | 41 <iron-icon icon="settings:note"></iron-icon> |
| 42 <div class="middle">$i18n{noteTitle}</div> | 42 <div class="middle">$i18n{noteTitle}</div> |
| 43 </div> | 43 </div> |
| 44 </template> | 44 </template> |
| 45 <div id="displayRow" class="settings-box" on-tap="onDisplayTap_" | 45 <div id="displayRow" class="settings-box" on-tap="onDisplayTap_" |
| 46 actionable> | 46 actionable> |
| 47 <iron-icon icon="settings:desktop-windows"></iron-icon> | 47 <iron-icon icon="settings:desktop-windows"></iron-icon> |
| 48 <div class="middle">$i18n{displayTitle}</div> | 48 <div class="middle">$i18n{displayTitle}</div> |
| 49 </div> | 49 </div> |
| 50 </neon-animatable> | 50 </neon-animatable> |
| 51 <template is="dom-if" name="pointers"> | 51 <template is="dom-if" name="pointers"> |
| 52 <settings-subpage | 52 <settings-subpage |
| 53 associated-control="[[$$('#pointersRow')]]" |
| 53 page-title="[[getPointersTitle_(hasMouse_, hasTouchpad_)]]"> | 54 page-title="[[getPointersTitle_(hasMouse_, hasTouchpad_)]]"> |
| 54 <settings-pointers prefs="{{prefs}}" | 55 <settings-pointers prefs="{{prefs}}" |
| 55 has-mouse="[[hasMouse_]]" has-touchpad="[[hasTouchpad_]]"> | 56 has-mouse="[[hasMouse_]]" has-touchpad="[[hasTouchpad_]]"> |
| 56 </settings-pointers> | 57 </settings-pointers> |
| 57 </settings-subpage> | 58 </settings-subpage> |
| 58 </template> | 59 </template> |
| 59 <template is="dom-if" name="keyboard"> | 60 <template is="dom-if" name="keyboard"> |
| 60 <settings-subpage page-title="$i18n{keyboardTitle}"> | 61 <settings-subpage |
| 62 associated-control="[[$$('#keyboardRow')]]" |
| 63 page-title="$i18n{keyboardTitle}"> |
| 61 <settings-keyboard prefs="{{prefs}}"></settings-keyboard> | 64 <settings-keyboard prefs="{{prefs}}"></settings-keyboard> |
| 62 </settings-subpage> | 65 </settings-subpage> |
| 63 </template> | 66 </template> |
| 64 <template is="dom-if" if=[[noteAllowed_]]> | 67 <template is="dom-if" if=[[noteAllowed_]]> |
| 65 <template is="dom-if" name="note"> | 68 <template is="dom-if" name="note"> |
| 66 <settings-subpage page-title="$i18n{noteTitle}"> | 69 <settings-subpage |
| 70 associated-control="[[$$('#noteRow')]]" |
| 71 page-title="$i18n{noteTitle}"> |
| 67 <settings-note prefs="{{prefs}}" current-route="{{currentRoute}}"> | 72 <settings-note prefs="{{prefs}}" current-route="{{currentRoute}}"> |
| 68 </settings-note> | 73 </settings-note> |
| 69 </settings-subpage> | 74 </settings-subpage> |
| 70 </template> | 75 </template> |
| 71 </template> | 76 </template> |
| 72 <template is="dom-if" name="display"> | 77 <template is="dom-if" name="display"> |
| 73 <settings-subpage page-title="$i18n{displayTitle}"> | 78 <settings-subpage |
| 79 associated-control="[[$$('#displayRow')]]" |
| 80 page-title="$i18n{displayTitle}"> |
| 74 <settings-display></settings-display> | 81 <settings-display></settings-display> |
| 75 </settings-subpage> | 82 </settings-subpage> |
| 76 </template> | 83 </template> |
| 77 </settings-animated-pages> | 84 </settings-animated-pages> |
| 78 </template> | 85 </template> |
| 79 <script src="device_page.js"></script> | 86 <script src="device_page.js"></script> |
| 80 </dom-module> | 87 </dom-module> |
| OLD | NEW |