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