| Index: chrome/browser/resources/settings/device_page/device_page.html
|
| diff --git a/chrome/browser/resources/settings/device_page/device_page.html b/chrome/browser/resources/settings/device_page/device_page.html
|
| index a8dd3bea3fd702705ebeed29053d4abc41a88a3e..f5dcd87932bfc265e58906cb0e0628b0b31eb80e 100644
|
| --- a/chrome/browser/resources/settings/device_page/device_page.html
|
| +++ b/chrome/browser/resources/settings/device_page/device_page.html
|
| @@ -7,6 +7,7 @@
|
| <link rel="import" href="/device_page/device_page_browser_proxy.html">
|
| <link rel="import" href="/device_page/display.html">
|
| <link rel="import" href="/device_page/keyboard.html">
|
| +<link rel="import" href="/device_page/note.html">
|
| <link rel="import" href="/device_page/pointers.html">
|
| <link rel="import" href="/icons.html">
|
| <link rel="import" href="/prefs/prefs.html">
|
| @@ -33,6 +34,13 @@
|
| <iron-icon icon="settings:keyboard"></iron-icon>
|
| <div class="middle">$i18n{keyboardTitle}</div>
|
| </div>
|
| + <template is="dom-if" if=[[noteAllowed_]]>
|
| + <div class="settings-box" on-tap="onNoteTap_"
|
| + actionable>
|
| + <iron-icon icon="settings:note"></iron-icon>
|
| + <div class="middle">$i18n{noteTitle}</div>
|
| + </div>
|
| + </template>
|
| <div id="displayRow" class="settings-box" on-tap="onDisplayTap_"
|
| actionable>
|
| <iron-icon icon="settings:desktop-windows"></iron-icon>
|
| @@ -53,6 +61,14 @@
|
| </settings-keyboard>
|
| </settings-subpage>
|
| </template>
|
| + <template is="dom-if" if=[[noteAllowed_]]>
|
| + <template is="dom-if" name="note">
|
| + <settings-subpage page-title="$i18n{noteTitle}">
|
| + <settings-note prefs="{{prefs}}" current-route="{{currentRoute}}">
|
| + </settings-note>
|
| + </settings-subpage>
|
| + </template>
|
| + </template>
|
| <template is="dom-if" name="display">
|
| <settings-subpage page-title="$i18n{displayTitle}">
|
| <settings-display></settings-display>
|
|
|