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 99 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
110 height: calc(100% - 56px); | 110 height: calc(100% - 56px); |
111 overflow: auto; | 111 overflow: auto; |
112 } | 112 } |
113 </style> | 113 </style> |
114 <settings-router current-route="{{currentRoute}}" | 114 <settings-router current-route="{{currentRoute}}" |
115 current-route-titles="{{currentRouteTitles}}"> | 115 current-route-titles="{{currentRouteTitles}}"> |
116 </settings-router> | 116 </settings-router> |
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 hide-search="[[pageVisibility_.hideToolbarSearchField]]" |
120 clear-label="$i18n{clearSearch}" search-prompt="$i18n{searchPrompt} | 121 clear-label="$i18n{clearSearch}" search-prompt="$i18n{searchPrompt} |
121 (coming soon!)" on-cr-menu-tap="onMenuButtonTap_"> | 122 (coming soon!)" on-cr-menu-tap="onMenuButtonTap_"> |
122 </cr-toolbar> | 123 </cr-toolbar> |
123 <app-drawer swipe-open> | 124 <app-drawer swipe-open> |
124 <div class="drawer-header">$i18n{settings}</div> | 125 <div class="drawer-header">$i18n{settings}</div> |
125 <div class="drawer-content"> | 126 <div class="drawer-content"> |
126 <settings-menu current-route="{{currentRoute}}" id="sideNav"> | 127 <settings-menu current-route="{{currentRoute}}" id="sideNav" |
| 128 page-visibility="[[pageVisibility_]]"> |
127 </settings-menu> | 129 </settings-menu> |
128 </div> | 130 </div> |
129 </app-drawer> | 131 </app-drawer> |
130 <paper-header-panel mode="waterfall"> | 132 <paper-header-panel mode="waterfall"> |
131 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}"> | 133 <settings-main prefs="{{prefs}}" current-route="{{currentRoute}}" |
| 134 page-visibility="[[pageVisibility_]]"> |
132 </settings-main> | 135 </settings-main> |
133 </paper-header-panel> | 136 </paper-header-panel> |
134 | 137 |
135 <!-- TODO(dbeam): remove before launch. --> | 138 <!-- TODO(dbeam): remove before launch. --> |
136 <div id="appeal" hidden="[[appealClosed_]]"> | 139 <div id="appeal" hidden="[[appealClosed_]]"> |
137 <span id="request"> | 140 <span id="request"> |
138 <h1>Please read: A personal appeal from the Chrome settings team.</h1> | 141 <h1>Please read: A personal appeal from the Chrome settings team.</h1> |
139 <a href="https://goo.gl/btju6c">Please file bugs</a> | 142 <a href="https://goo.gl/btju6c">Please file bugs</a> |
140 before you | 143 before you |
141 <a href="chrome://settings-frame">go back to the old settings</a>. | 144 <a href="chrome://settings-frame">go back to the old settings</a>. |
142 </span> | 145 </span> |
143 <span id="close" tabindex=0 on-tap="onCloseAppealTap_">✕</span> | 146 <span id="close" tabindex=0 on-tap="onCloseAppealTap_">✕</span> |
144 </div> | 147 </div> |
145 | 148 |
146 </template> | 149 </template> |
147 <script src="settings_ui.js"></script> | 150 <script src="settings_ui.js"></script> |
148 </dom-module> | 151 </dom-module> |
OLD | NEW |