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

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

Issue 2235323002: MD Settings: Fix advanced sync page reload. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 1 <link rel="import" href="chrome://resources/cr_elements/icons.html">
2 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 2 <link rel="import" href="chrome://resources/html/i18n_behavior.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/html/web_ui_listener_behavior.html"> 4 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 5 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
8 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> 8 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html ">
9 <link rel="import" href="/controls/settings_checkbox.html"> 9 <link rel="import" href="/controls/settings_checkbox.html">
10 <link rel="import" href="/people_page/sync_page.html"> 10 <link rel="import" href="/people_page/sync_page.html">
(...skipping 221 matching lines...) Expand 10 before | Expand all | Expand 10 after
232 232
233 <template is="dom-if" if=[[profileManagesSupervisedUsers_]]> 233 <template is="dom-if" if=[[profileManagesSupervisedUsers_]]>
234 <div id="manageSupervisedUsersContainer" class="settings-box"> 234 <div id="manageSupervisedUsersContainer" class="settings-box">
235 <paper-button class="primary-button" 235 <paper-button class="primary-button"
236 on-tap="onManageSupervisedUsers_"> 236 on-tap="onManageSupervisedUsers_">
237 $i18n{manageSupervisedUsers} 237 $i18n{manageSupervisedUsers}
238 </paper-button> 238 </paper-button>
239 </div> 239 </div>
240 </template> 240 </template>
241 </neon-animatable> 241 </neon-animatable>
242 <template is="dom-if" if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]"> 242 <template is="dom-if" name="sync"
243 <template is="dom-if" name="sync"> 243 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]">
244 <settings-subpage 244 <settings-subpage
245 associated-control="[[$$('#customize-sync')]]" 245 associated-control="[[$$('#customize-sync')]]"
246 page-title="$i18n{syncPageTitle}"> 246 page-title="$i18n{syncPageTitle}"
247 <settings-sync-page></settings-sync-page> 247 no-search$="[[!isAdvancedSyncSettingsVisible_(syncStatus)]]">
248 </settings-subpage> 248 <settings-sync-page></settings-sync-page>
249 </template> 249 </settings-subpage>
250 </template> 250 </template>
251 <if expr="chromeos"> 251 <if expr="chromeos">
252 <template is="dom-if" if="[[quickUnlockEnabled_]]"> 252 <template is="dom-if" if="[[quickUnlockEnabled_]]">
253 <template is="dom-if" name="lockScreen"> 253 <template is="dom-if" name="lockScreen">
254 <settings-subpage page-title="$i18n{lockScreenTitle}"> 254 <settings-subpage page-title="$i18n{lockScreenTitle}">
255 <settings-lock-screen 255 <settings-lock-screen
256 prefs="{{prefs}}"> 256 prefs="{{prefs}}">
257 </settings-lock-screen> 257 </settings-lock-screen>
258 </settings-subpage> 258 </settings-subpage>
259 </template> 259 </template>
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 314
315 <if expr="chromeos"> 315 <if expr="chromeos">
316 <template is="dom-if" if="[[easyUnlockEnabled_]]"> 316 <template is="dom-if" if="[[easyUnlockEnabled_]]">
317 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> 317 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog">
318 </easy-unlock-turn-off-dialog> 318 </easy-unlock-turn-off-dialog>
319 </template> 319 </template>
320 </if> 320 </if>
321 </template> 321 </template>
322 <script src="people_page.js"></script> 322 <script src="people_page.js"></script>
323 </dom-module> 323 </dom-module>
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698