Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(728)

Side by Side Diff: chrome/browser/resources/settings/basic_page/basic_page.html

Issue 2660383002: [MD settings] idle load basic and advanced pages (Closed)
Patch Set: added unit test Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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">
Dan Beam 2017/02/02 00:19:36 please rebase
dschuyler 2017/02/02 02:28:15 Done.
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.html "> 8 <link rel="import" href="/passwords_and_forms_page/passwords_and_forms_page.html ">
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 85 matching lines...) Expand 10 before | Expand all | Expand 10 after
99 </template> 100 </template>
100 <if expr="chromeos"> 101 <if expr="chromeos">
101 <template is="dom-if" if="[[showPage(pageVisibility.device)]]" restamp> 102 <template is="dom-if" if="[[showPage(pageVisibility.device)]]" restamp>
102 <settings-section page-title="$i18n{devicePageTitle}" 103 <settings-section page-title="$i18n{devicePageTitle}"
103 section="device"> 104 section="device">
104 <settings-device-page prefs="{{prefs}}"></settings-device-page> 105 <settings-device-page prefs="{{prefs}}"></settings-device-page>
105 </settings-section> 106 </settings-section>
106 </template> 107 </template>
107 </if> 108 </if>
108 <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp> 109 <template is="dom-if" if="[[showPage(pageVisibility.search)]]" restamp>
109 <settings-section page-title="$i18n{searchPageTitle}" section="search" > 110 <settings-section page-title="$i18n{searchPageTitle}"
111 section="search">
110 <settings-search-page prefs="{{prefs}}"></settings-search-page> 112 <settings-search-page prefs="{{prefs}}"></settings-search-page>
111 </settings-section> 113 </settings-section>
112 </template> 114 </template>
113 <if expr="chromeos"> 115 <if expr="chromeos">
114 <template is="dom-if" 116 <template is="dom-if"
115 if="[[shouldShowAndroidApps_(showAndroidApps, pageVisibility)]]" 117 if="[[shouldShowAndroidApps_(showAndroidApps, pageVisibility)]]"
116 restamp> 118 restamp>
117 <settings-section page-title="$i18n{androidAppsPageTitle}" 119 <settings-section page-title="$i18n{androidAppsPageTitle}"
118 section="androidApps"> 120 section="androidApps">
119 <settings-android-apps-page prefs="{{prefs}}"> 121 <settings-android-apps-page prefs="{{prefs}}">
(...skipping 13 matching lines...) Expand all
133 <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]" 135 <template is="dom-if" if="[[showPage(pageVisibility.onStartup)]]"
134 restamp> 136 restamp>
135 <settings-section page-title="$i18n{onStartup}" section="onStartup"> 137 <settings-section page-title="$i18n{onStartup}" section="onStartup">
136 <settings-on-startup-page prefs="{{prefs}}"> 138 <settings-on-startup-page prefs="{{prefs}}">
137 </settings-on-startup-page> 139 </settings-on-startup-page>
138 </settings-section> 140 </settings-section>
139 </template> 141 </template>
140 </div> 142 </div>
141 </template> 143 </template>
142 144
143 <template is="dom-if" 145 <div hidden$="[[!showAdvancedSettings_(pageVisibility.advancedSettings)]]">
144 if="[[showAdvancedSettings_(pageVisibility.advancedSettings)]]">
145 <template is="dom-if" if="[[showAdvancedToggle_( 146 <template is="dom-if" if="[[showAdvancedToggle_(
146 inSearchMode, hasExpandedSection_)]]"> 147 inSearchMode, hasExpandedSection_)]]">
147 <div id="toggleSpacer"></div> 148 <div id="toggleSpacer"></div>
148 <h2 id="toggleContainer"> 149 <h2 id="toggleContainer">
149 <paper-button id="advancedToggle" active="{{advancedToggleExpanded}}" 150 <paper-button id="advancedToggle" active="{{advancedToggleExpanded}}"
150 aria-active-attribute="aria-expanded" toggles> 151 aria-active-attribute="aria-expanded" toggles>
151 <span>$i18n{advancedPageTitle}</span> 152 <span>$i18n{advancedPageTitle}</span>
152 <iron-icon icon="[[getArrowIcon_(advancedToggleExpanded)]]"> 153 <iron-icon icon="[[getArrowIcon_(advancedToggleExpanded)]]">
153 </iron-icon> 154 </iron-icon>
154 </paper-button> 155 </paper-button>
155 </h2> 156 </h2>
156 </template> 157 </template>
157 158
158 <template is="dom-if" if="[[showAdvancedPage_( 159 <template is="settings-idle-render" id="advancedPageTemplate">
159 currentRoute_, inSearchMode, hasExpandedSection_, 160 <div id="advancedPage" hidden$="[[!showAdvancedPage_(
160 advancedToggleExpanded)]]"> 161 currentRoute_, inSearchMode, hasExpandedSection_,
161 <div id="advancedPage"> 162 advancedToggleExpanded)]]">
162 <if expr="chromeos"> 163 <if expr="chromeos">
163 <template is="dom-if" if="[[showPage(pageVisibility.dateTime)]]" 164 <template is="dom-if" if="[[showPage(pageVisibility.dateTime)]]"
164 restamp> 165 restamp>
165 <settings-section page-title="$i18n{dateTimePageTitle}" 166 <settings-section page-title="$i18n{dateTimePageTitle}"
166 section="dateTime"> 167 section="dateTime">
167 <settings-date-time-page prefs="{{prefs}}" 168 <settings-date-time-page prefs="{{prefs}}"
168 page-visibility="[[pageVisibility.dateTime]]"> 169 page-visibility="[[pageVisibility.dateTime]]">
169 </settings-date-time-page> 170 </settings-date-time-page>
170 </settings-section> 171 </settings-section>
171 </template> 172 </template>
(...skipping 67 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 </if> 240 </if>
240 <template is="dom-if" if="[[showPage(pageVisibility.reset)]]" 241 <template is="dom-if" if="[[showPage(pageVisibility.reset)]]"
241 restamp> 242 restamp>
242 <settings-section page-title="$i18n{resetPageTitle}" 243 <settings-section page-title="$i18n{resetPageTitle}"
243 section="reset"> 244 section="reset">
244 <settings-reset-page></settings-reset-page> 245 <settings-reset-page></settings-reset-page>
245 </settings-section> 246 </settings-section>
246 </template> 247 </template>
247 </div> 248 </div>
248 </template> 249 </template>
249 </template> 250 </div>
250 </template> 251 </template>
251 <script src="basic_page.js"></script> 252 <script src="basic_page.js"></script>
252 </dom-module> 253 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698