Chromium Code Reviews| Index: chrome/browser/resources/settings/basic_page/basic_page.html |
| diff --git a/chrome/browser/resources/settings/basic_page/basic_page.html b/chrome/browser/resources/settings/basic_page/basic_page.html |
| index 8b59da3d20096627f65f8077ddbb843d7d2235b0..c98dd508e74801f8f983f791012420ad141a3d18 100644 |
| --- a/chrome/browser/resources/settings/basic_page/basic_page.html |
| +++ b/chrome/browser/resources/settings/basic_page/basic_page.html |
| @@ -1,6 +1,7 @@ |
| <link rel="import" href="chrome://resources/html/polymer.html"> |
| <link rel="import" href="/a11y_page/a11y_page.html"> |
| <link rel="import" href="/appearance_page/appearance_page.html"> |
| +<link rel="import" href="/controls/settings_idle_render.html"> |
|
Dan Beam
2017/02/02 00:19:36
please rebase
dschuyler
2017/02/02 02:28:15
Done.
|
| <link rel="import" href="/downloads_page/downloads_page.html"> |
| <link rel="import" href="/languages_page/languages_page.html"> |
| <link rel="import" href="/on_startup_page/on_startup_page.html"> |
| @@ -106,7 +107,8 @@ |
| </template> |
| </if> |
| <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp> |
| - <settings-section page-title="$i18n{searchPageTitle}" section="search"> |
| + <settings-section page-title="$i18n{searchPageTitle}" |
| + section="search"> |
| <settings-search-page prefs="{{prefs}}"></settings-search-page> |
| </settings-section> |
| </template> |
| @@ -140,8 +142,7 @@ |
| </div> |
| </template> |
| - <template is="dom-if" |
| - if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> |
| + <div hidden$="[[!showAdvancedSettings_(pageVisibility.advancedSettings)]]"> |
| <template is="dom-if" if="[[showAdvancedToggle_( |
| inSearchMode, hasExpandedSection_)]]"> |
| <div id="toggleSpacer"></div> |
| @@ -155,10 +156,10 @@ |
| </h2> |
| </template> |
| - <template is="dom-if" if="[[showAdvancedPage_( |
| - currentRoute_, inSearchMode, hasExpandedSection_, |
| - advancedToggleExpanded)]]"> |
| - <div id="advancedPage"> |
| + <template is="settings-idle-render" id="advancedPageTemplate"> |
| + <div id="advancedPage" hidden$="[[!showAdvancedPage_( |
| + currentRoute_, inSearchMode, hasExpandedSection_, |
| + advancedToggleExpanded)]]"> |
| <if expr="chromeos"> |
| <template is="dom-if" if="[[showPage(pageVisibility.dateTime)]]" |
| restamp> |
| @@ -246,7 +247,7 @@ |
| </template> |
| </div> |
| </template> |
| - </template> |
| + </div> |
| </template> |
| <script src="basic_page.js"></script> |
| </dom-module> |