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

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

Issue 2224163002: Settings Router Refactor: Replace route.subpage usage with route.path (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix tests 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
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/polymer.html"> 2 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 4 <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/paper-button/paper-butt on.html"> 5 <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-checkbox/paper-ch eckbox.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-checkbox/paper-ch eckbox.html">
7 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html "> 7 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html ">
8 <link rel="import" href="/controls/settings_checkbox.html"> 8 <link rel="import" href="/controls/settings_checkbox.html">
9 <link rel="import" href="/people_page/sync_page.html"> 9 <link rel="import" href="/people_page/sync_page.html">
10 <link rel="import" href="/people_page/profile_info_browser_proxy.html"> 10 <link rel="import" href="/people_page/profile_info_browser_proxy.html">
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 background-size: cover; 66 background-size: cover;
67 height: var(--iron-icon-height); 67 height: var(--iron-icon-height);
68 width: var(--iron-icon-width); 68 width: var(--iron-icon-width);
69 } 69 }
70 70
71 paper-checkbox { 71 paper-checkbox {
72 margin: 16px 0 2px; 72 margin: 16px 0 2px;
73 } 73 }
74 </style> 74 </style>
75 <settings-animated-pages id="pages" section="people"> 75 <settings-animated-pages id="pages" section="people">
76 <neon-animatable id="main"> 76 <neon-animatable route-path="default">
77 <div id="picture-subpage-trigger" class="settings-box first two-line"> 77 <div id="picture-subpage-trigger" class="settings-box first two-line">
78 <img id="profile-icon" src="[[profileIconUrl_]]" 78 <img id="profile-icon" src="[[profileIconUrl_]]"
79 on-tap="onPictureTap_" actionable> 79 on-tap="onPictureTap_" actionable>
80 <div class="middle"> 80 <div class="middle">
81 <if expr="not chromeos"> 81 <if expr="not chromeos">
82 <span id="profile-name" on-tap="onProfileNameTap_" actionable> 82 <span id="profile-name" on-tap="onProfileNameTap_" actionable>
83 [[profileName_]] 83 [[profileName_]]
84 </span> 84 </span>
85 </if> 85 </if>
86 <if expr="chromeos"> 86 <if expr="chromeos">
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
228 <template is="dom-if" if=[[profileManagesSupervisedUsers_]]> 228 <template is="dom-if" if=[[profileManagesSupervisedUsers_]]>
229 <div id="manageSupervisedUsersContainer" class="settings-box"> 229 <div id="manageSupervisedUsersContainer" class="settings-box">
230 <paper-button class="primary-button" 230 <paper-button class="primary-button"
231 on-tap="onManageSupervisedUsers_"> 231 on-tap="onManageSupervisedUsers_">
232 $i18n{manageSupervisedUsers} 232 $i18n{manageSupervisedUsers}
233 </paper-button> 233 </paper-button>
234 </div> 234 </div>
235 </template> 235 </template>
236 </neon-animatable> 236 </neon-animatable>
237 <template is="dom-if" if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]"> 237 <template is="dom-if" if="[[isAdvancedSyncSettingsVisible_(syncStatus)]]">
238 <template is="dom-if" name="sync"> 238 <template is="dom-if" route-path="/syncSetup">
239 <settings-subpage 239 <settings-subpage
240 associated-control="[[$$('#customize-sync')]]" 240 associated-control="[[$$('#customize-sync')]]"
241 page-title="$i18n{syncPageTitle}"> 241 page-title="$i18n{syncPageTitle}">
242 <settings-sync-page></settings-sync-page> 242 <settings-sync-page></settings-sync-page>
243 </settings-subpage> 243 </settings-subpage>
244 </template> 244 </template>
245 </template> 245 </template>
246 <if expr="chromeos"> 246 <if expr="chromeos">
247 <template is="dom-if" name="quick-unlock-authenticate" no-search> 247 <template is="dom-if" route-path="/quickUnlock/authenticate" no-search>
248 <settings-subpage page-title="$i18n{quickUnlockTitle}"> 248 <settings-subpage page-title="$i18n{quickUnlockTitle}">
249 <settings-quick-unlock-authenticate 249 <settings-quick-unlock-authenticate
250 set-modes="{{quickUnlockSetModes}}" 250 set-modes="{{quickUnlockSetModes}}"
251 profile-name="[[profileName_]]"> 251 profile-name="[[profileName_]]">
252 </settings-quick-unlock-authenticate> 252 </settings-quick-unlock-authenticate>
253 </settings-subpage> 253 </settings-subpage>
254 </template> 254 </template>
255 <template is="dom-if" name="quick-unlock-choose-method" no-search> 255 <template is="dom-if" route-path="/quickUnlock/chooseMethod" no-search>
256 <settings-subpage page-title="$i18n{quickUnlockTitle}"> 256 <settings-subpage page-title="$i18n{quickUnlockTitle}">
257 <settings-quick-unlock-choose-method 257 <settings-quick-unlock-choose-method
258 set-modes="[[quickUnlockSetModes]]" prefs="{{prefs}}"> 258 set-modes="[[quickUnlockSetModes]]" prefs="{{prefs}}">
259 </settings-quick-unlock-choose-method> 259 </settings-quick-unlock-choose-method>
260 </settings-subpage> 260 </settings-subpage>
261 </template> 261 </template>
262 <template is="dom-if" name="quick-unlock-setup-pin" no-search> 262 <template is="dom-if" route-path="/quickUnlock/setupPin" no-search>
263 <settings-subpage page-title="$i18n{quickUnlockTitle}"> 263 <settings-subpage page-title="$i18n{quickUnlockTitle}">
264 <settings-quick-unlock-setup-pin set-modes="[[quickUnlockSetModes]]"> 264 <settings-quick-unlock-setup-pin set-modes="[[quickUnlockSetModes]]">
265 </settings-quick-unlock-setup-pin> 265 </settings-quick-unlock-setup-pin>
266 </settings-subpage> 266 </settings-subpage>
267 </template> 267 </template>
268 <template is="dom-if" name="users"> 268 <template is="dom-if" route-path="/accounts">
269 <settings-subpage 269 <settings-subpage
270 associated-control="[[$$('#manage-other-people-subpage-trigger')]]" 270 associated-control="[[$$('#manage-other-people-subpage-trigger')]]"
271 page-title="$i18n{usersPageTitle}"> 271 page-title="$i18n{usersPageTitle}">
272 <settings-users-page prefs="{{prefs}}"></settings-users-page> 272 <settings-users-page prefs="{{prefs}}"></settings-users-page>
273 </settings-subpage> 273 </settings-subpage>
274 </template> 274 </template>
275 <template is="dom-if" name="changePicture"> 275 <template is="dom-if" route-path="/changePicture">
276 <settings-subpage 276 <settings-subpage
277 associated-control="[[$$('#picture-subpage-trigger')]]" 277 associated-control="[[$$('#picture-subpage-trigger')]]"
278 page-title="$i18n{changePictureTitle}"> 278 page-title="$i18n{changePictureTitle}">
279 <settings-change-picture></settings-change-picture> 279 <settings-change-picture></settings-change-picture>
280 </settings-subpage> 280 </settings-subpage>
281 </template> 281 </template>
282 </if> 282 </if>
283 <if expr="not chromeos"> 283 <if expr="not chromeos">
284 <template is="dom-if" name="manageProfile"> 284 <template is="dom-if" route-path="/manageProfile">
285 <settings-subpage 285 <settings-subpage
286 associated-control="[[$$('#picture-subpage-trigger')]]" 286 associated-control="[[$$('#picture-subpage-trigger')]]"
287 page-title="$i18n{editPerson}"> 287 page-title="$i18n{editPerson}">
288 <settings-manage-profile profile-icon-url="[[profileIconUrl_]]" 288 <settings-manage-profile profile-icon-url="[[profileIconUrl_]]"
289 profile-name="[[profileName_]]"> 289 profile-name="[[profileName_]]">
290 </settings-manage-profile> 290 </settings-manage-profile>
291 </settings-subpage> 291 </settings-subpage>
292 </template> 292 </template>
293 </if> 293 </if>
294 </settings-animated-pages> 294 </settings-animated-pages>
(...skipping 26 matching lines...) Expand all
321 321
322 <if expr="chromeos"> 322 <if expr="chromeos">
323 <template is="dom-if" if="[[easyUnlockEnabled_]]"> 323 <template is="dom-if" if="[[easyUnlockEnabled_]]">
324 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> 324 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog">
325 </easy-unlock-turn-off-dialog> 325 </easy-unlock-turn-off-dialog>
326 </template> 326 </template>
327 </if> 327 </if>
328 </template> 328 </template>
329 <script src="people_page.js"></script> 329 <script src="people_page.js"></script>
330 </dom-module> 330 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698