| OLD | NEW |
| 1 <link rel="import" href="chrome://resources/html/polymer.html"> | 1 <link rel="import" href="chrome://resources/html/polymer.html"> |
| 2 <link rel="import" href="../a11y_page/a11y_page.html"> | 2 <link rel="import" href="../a11y_page/a11y_page.html"> |
| 3 <link rel="import" href="../appearance_page/appearance_page.html"> | 3 <link rel="import" href="../appearance_page/appearance_page.html"> |
| 4 <link rel="import" href="../controls/settings_idle_render.html"> |
| 4 <link rel="import" href="../downloads_page/downloads_page.html"> | 5 <link rel="import" href="../downloads_page/downloads_page.html"> |
| 5 <link rel="import" href="../languages_page/languages_page.html"> | 6 <link rel="import" href="../languages_page/languages_page.html"> |
| 6 <link rel="import" href="../on_startup_page/on_startup_page.html"> | 7 <link rel="import" href="../on_startup_page/on_startup_page.html"> |
| 7 <link rel="import" href="../passwords_and_forms_page/passwords_and_forms_page.ht
ml"> | 8 <link rel="import" href="../passwords_and_forms_page/passwords_and_forms_page.ht
ml"> |
| 8 <link rel="import" href="../people_page/people_page.html"> | 9 <link rel="import" href="../people_page/people_page.html"> |
| 9 <link rel="import" href="../printing_page/printing_page.html"> | 10 <link rel="import" href="../printing_page/printing_page.html"> |
| 10 <link rel="import" href="../privacy_page/privacy_page.html"> | 11 <link rel="import" href="../privacy_page/privacy_page.html"> |
| 11 <link rel="import" href="../reset_page/reset_page.html"> | 12 <link rel="import" href="../reset_page/reset_page.html"> |
| 12 <link rel="import" href="../reset_page/reset_profile_banner.html"> | 13 <link rel="import" href="../reset_page/reset_profile_banner.html"> |
| 13 <link rel="import" href="../search_page/search_page.html"> | 14 <link rel="import" href="../search_page/search_page.html"> |
| (...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 </template> | 108 </template> |
| 108 <if expr="chromeos"> | 109 <if expr="chromeos"> |
| 109 <template is="dom-if" if="[[showPage(pageVisibility.device)]]" restamp> | 110 <template is="dom-if" if="[[showPage(pageVisibility.device)]]" restamp> |
| 110 <settings-section page-title="$i18n{devicePageTitle}" | 111 <settings-section page-title="$i18n{devicePageTitle}" |
| 111 section="device"> | 112 section="device"> |
| 112 <settings-device-page prefs="{{prefs}}"></settings-device-page> | 113 <settings-device-page prefs="{{prefs}}"></settings-device-page> |
| 113 </settings-section> | 114 </settings-section> |
| 114 </template> | 115 </template> |
| 115 </if> | 116 </if> |
| 116 <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp> | 117 <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp> |
| 117 <settings-section page-title="$i18n{searchPageTitle}" section="search"
> | 118 <settings-section page-title="$i18n{searchPageTitle}" |
| 119 section="search"> |
| 118 <settings-search-page prefs="{{prefs}}"></settings-search-page> | 120 <settings-search-page prefs="{{prefs}}"></settings-search-page> |
| 119 </settings-section> | 121 </settings-section> |
| 120 </template> | 122 </template> |
| 121 <if expr="chromeos"> | 123 <if expr="chromeos"> |
| 122 <template is="dom-if" | 124 <template is="dom-if" |
| 123 if="[[shouldShowAndroidApps_(showAndroidApps, pageVisibility)]]" | 125 if="[[shouldShowAndroidApps_(showAndroidApps, pageVisibility)]]" |
| 124 restamp> | 126 restamp> |
| 125 <settings-section page-title="$i18n{androidAppsPageTitle}" | 127 <settings-section page-title="$i18n{androidAppsPageTitle}" |
| 126 section="androidApps"> | 128 section="androidApps"> |
| 127 <settings-android-apps-page prefs="{{prefs}}"> | 129 <settings-android-apps-page prefs="{{prefs}}"> |
| (...skipping 13 matching lines...) Expand all Loading... |
| 141 <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]" | 143 <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]" |
| 142 restamp> | 144 restamp> |
| 143 <settings-section page-title="$i18n{onStartup}" section="onStartup"> | 145 <settings-section page-title="$i18n{onStartup}" section="onStartup"> |
| 144 <settings-on-startup-page prefs="{{prefs}}"> | 146 <settings-on-startup-page prefs="{{prefs}}"> |
| 145 </settings-on-startup-page> | 147 </settings-on-startup-page> |
| 146 </settings-section> | 148 </settings-section> |
| 147 </template> | 149 </template> |
| 148 </div> | 150 </div> |
| 149 </template> | 151 </template> |
| 150 | 152 |
| 151 <template is="dom-if" | 153 <div hidden$="[[!showAdvancedSettings_(pageVisibility.advancedSettings)]]"> |
| 152 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]"> | |
| 153 <template is="dom-if" if="[[showAdvancedToggle_( | 154 <template is="dom-if" if="[[showAdvancedToggle_( |
| 154 inSearchMode, hasExpandedSection_)]]"> | 155 inSearchMode, hasExpandedSection_)]]"> |
| 155 <div id="toggleSpacer"></div> | 156 <div id="toggleSpacer"></div> |
| 156 <h2 id="toggleContainer"> | 157 <h2 id="toggleContainer"> |
| 157 <paper-button id="advancedToggle" active="{{advancedToggleExpanded}}" | 158 <paper-button id="advancedToggle" active="{{advancedToggleExpanded}}" |
| 158 aria-active-attribute="aria-expanded" toggles> | 159 aria-active-attribute="aria-expanded" toggles> |
| 159 <span>$i18n{advancedPageTitle}</span> | 160 <span>$i18n{advancedPageTitle}</span> |
| 160 <iron-icon icon="[[getArrowIcon_(advancedToggleExpanded)]]"> | 161 <iron-icon icon="[[getArrowIcon_(advancedToggleExpanded)]]"> |
| 161 </iron-icon> | 162 </iron-icon> |
| 162 </paper-button> | 163 </paper-button> |
| 163 </h2> | 164 </h2> |
| 164 </template> | 165 </template> |
| 165 | 166 |
| 166 <template is="dom-if" if="[[showAdvancedPage_( | 167 <template is="settings-idle-render" id="advancedPageTemplate"> |
| 167 currentRoute_, inSearchMode, hasExpandedSection_, | 168 <div id="advancedPage" hidden$="[[!showAdvancedPage_( |
| 168 advancedToggleExpanded)]]"> | 169 currentRoute_, inSearchMode, hasExpandedSection_, |
| 169 <div id="advancedPage"> | 170 advancedToggleExpanded)]]"> |
| 170 <if expr="chromeos"> | 171 <if expr="chromeos"> |
| 171 <template is="dom-if" if="[[showPage(pageVisibility.dateTime)]]" | 172 <template is="dom-if" if="[[showPage(pageVisibility.dateTime)]]" |
| 172 restamp> | 173 restamp> |
| 173 <settings-section page-title="$i18n{dateTimePageTitle}" | 174 <settings-section page-title="$i18n{dateTimePageTitle}" |
| 174 section="dateTime"> | 175 section="dateTime"> |
| 175 <settings-date-time-page prefs="{{prefs}}" | 176 <settings-date-time-page prefs="{{prefs}}" |
| 176 page-visibility="[[pageVisibility.dateTime]]"> | 177 page-visibility="[[pageVisibility.dateTime]]"> |
| 177 </settings-date-time-page> | 178 </settings-date-time-page> |
| 178 </settings-section> | 179 </settings-section> |
| 179 </template> | 180 </template> |
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 237 </if> | 238 </if> |
| 238 <template is="dom-if" if="[[showPage(pageVisibility.reset)]]" | 239 <template is="dom-if" if="[[showPage(pageVisibility.reset)]]" |
| 239 restamp> | 240 restamp> |
| 240 <settings-section page-title="$i18n{resetPageTitle}" | 241 <settings-section page-title="$i18n{resetPageTitle}" |
| 241 section="reset"> | 242 section="reset"> |
| 242 <settings-reset-page></settings-reset-page> | 243 <settings-reset-page></settings-reset-page> |
| 243 </settings-section> | 244 </settings-section> |
| 244 </template> | 245 </template> |
| 245 </div> | 246 </div> |
| 246 </template> | 247 </template> |
| 247 </template> | 248 </div> |
| 248 </template> | 249 </template> |
| 249 <script src="basic_page.js"></script> | 250 <script src="basic_page.js"></script> |
| 250 </dom-module> | 251 </dom-module> |
| OLD | NEW |