| 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 d56f44b110d575e0a57343801b443b7e6256e41d..7f75d71b7d58e539d7d42e9eeaf640a40abc13d1 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">
|
| <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">
|
| @@ -114,7 +115,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>
|
| @@ -148,8 +150,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>
|
| @@ -163,10 +164,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>
|
| @@ -244,7 +245,7 @@
|
| </template>
|
| </div>
|
| </template>
|
| - </template>
|
| + </div>
|
| </template>
|
| <script src="basic_page.js"></script>
|
| </dom-module>
|
|
|