OLD | NEW |
1 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht
ml"> | 1 <link rel="import" href="chrome://resources/cr_elements/cr_toolbar/cr_toolbar.ht
ml"> |
2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> | 2 <link rel="import" href="chrome://resources/cr_elements/icons.html"> |
3 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
4 <link rel="import" href="chrome://resources/polymer/v1_0/app-layout/app-drawer/a
pp-drawer.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/app-layout/app-drawer/a
pp-drawer.html"> |
5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-f
lex-layout.html"> |
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape
r-header-panel.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-header-panel/pape
r-header-panel.html"> |
7 <link rel="import" href="/direction_delegate.html"> | 7 <link rel="import" href="/direction_delegate.html"> |
8 <link rel="import" href="/i18n_setup.html"> | 8 <link rel="import" href="/i18n_setup.html"> |
9 <link rel="import" href="/icons.html"> | 9 <link rel="import" href="/icons.html"> |
10 <link rel="import" href="/settings_main/settings_main.html"> | 10 <link rel="import" href="/settings_main/settings_main.html"> |
(...skipping 106 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
117 <!-- TODO(dpapad): Remove "coming soon" string once crbug.com/608535 fully | 117 <!-- TODO(dpapad): Remove "coming soon" string once crbug.com/608535 fully |
118 addressed --> | 118 addressed --> |
119 <cr-toolbar page-name="$i18n{settings}" | 119 <cr-toolbar page-name="$i18n{settings}" |
120 clear-label="$i18n{clearSearch}" search-prompt="$i18n{searchPrompt} | 120 clear-label="$i18n{clearSearch}" search-prompt="$i18n{searchPrompt} |
121 (coming soon!)" on-cr-menu-tap="onMenuButtonTap_" | 121 (coming soon!)" on-cr-menu-tap="onMenuButtonTap_" |
122 spinner-active="[[toolbarSpinnerActive_]]"> | 122 spinner-active="[[toolbarSpinnerActive_]]"> |
123 </cr-toolbar> | 123 </cr-toolbar> |
124 <app-drawer swipe-open> | 124 <app-drawer swipe-open> |
125 <div class="drawer-header">$i18n{settings}</div> | 125 <div class="drawer-header">$i18n{settings}</div> |
126 <div class="drawer-content"> | 126 <div class="drawer-content"> |
127 <settings-menu current-route="{{currentRoute}}" id="sideNav"> | 127 <settings-menu current-route="{{currentRoute}}" id="sideNav" |
| 128 page-visibility="[[pageVisibility_]]"> |
128 </settings-menu> | 129 </settings-menu> |
129 </div> | 130 </div> |
130 </app-drawer> | 131 </app-drawer> |
131 <paper-header-panel mode="waterfall"> | 132 <paper-header-panel mode="waterfall"> |
132 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}" | 133 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}" |
133 toolbar-spinner-active="{{toolbarSpinnerActive_}}"> | 134 toolbar-spinner-active="{{toolbarSpinnerActive_}}" |
| 135 page-visibility="[[pageVisibility_]]"> |
134 </settings-main> | 136 </settings-main> |
135 </paper-header-panel> | 137 </paper-header-panel> |
136 | 138 |
137 <!-- TODO(dbeam): remove before launch. --> | 139 <!-- TODO(dbeam): remove before launch. --> |
138 <div id="appeal" hidden="[[appealClosed_]]"> | 140 <div id="appeal" hidden="[[appealClosed_]]"> |
139 <span id="request"> | 141 <span id="request"> |
140 <h1>Please read: A personal appeal from the Chrome settings team.</h1> | 142 <h1>Please read: A personal appeal from the Chrome settings team.</h1> |
141 <a href="[[appealBugUrl_]]">Please file bugs</a> | 143 <a href="[[appealBugUrl_]]">Please file bugs</a> |
142 before you | 144 before you |
143 <a href="chrome://settings-frame">go back to the old settings</a>. | 145 <a href="chrome://settings-frame">go back to the old settings</a>. |
144 </span> | 146 </span> |
145 <span id="close" tabindex=0 on-tap="onCloseAppealTap_">✕</span> | 147 <span id="close" tabindex=0 on-tap="onCloseAppealTap_">✕</span> |
146 </div> | 148 </div> |
147 | 149 |
148 </template> | 150 </template> |
149 <script src="settings_ui.js"></script> | 151 <script src="settings_ui.js"></script> |
150 </dom-module> | 152 </dom-module> |
OLD | NEW |