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

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

Issue 2210933004: Settings Router Refactor: Kill settings-router. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge yet again because this conflicts with everything 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 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 background-image: url(../../../../../ui/webui/resources/images/200-logo_ googleg.png); 65 background-image: url(../../../../../ui/webui/resources/images/200-logo_ googleg.png);
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" current-route="{{currentRoute}}" 75 <settings-animated-pages id="pages" section="people">
76 section="people">
77 <neon-animatable id="main"> 76 <neon-animatable id="main">
78 <div class="settings-box first two-line"> 77 <div class="settings-box first two-line">
79 <img id="profile-icon" src="[[profileIconUrl_]]" 78 <img id="profile-icon" src="[[profileIconUrl_]]"
80 on-tap="onPictureTap_" actionable> 79 on-tap="onPictureTap_" actionable>
81 <div class="middle"> 80 <div class="middle">
82 <if expr="not chromeos"> 81 <if expr="not chromeos">
83 <span id="profile-name" on-tap="onProfileNameTap_" actionable> 82 <span id="profile-name" on-tap="onProfileNameTap_" actionable>
84 [[profileName_]] 83 [[profileName_]]
85 </span> 84 </span>
86 </if> 85 </if>
(...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after
230 <div id="manageSupervisedUsersContainer" class="settings-box"> 229 <div id="manageSupervisedUsersContainer" class="settings-box">
231 <paper-button class="primary-button" 230 <paper-button class="primary-button"
232 on-tap="onManageSupervisedUsers_"> 231 on-tap="onManageSupervisedUsers_">
233 $i18n{manageSupervisedUsers} 232 $i18n{manageSupervisedUsers}
234 </paper-button> 233 </paper-button>
235 </div> 234 </div>
236 </template> 235 </template>
237 </neon-animatable> 236 </neon-animatable>
238 <template is="dom-if" name="sync"> 237 <template is="dom-if" name="sync">
239 <settings-subpage page-title="$i18n{syncPageTitle}"> 238 <settings-subpage page-title="$i18n{syncPageTitle}">
240 <settings-sync-page current-route="[[currentRoute]]"> 239 <settings-sync-page>
Dan Beam 2016/08/05 18:25:18 nit: unwrap
tommycli 2016/08/05 18:54:05 Done.
241 </settings-sync-page> 240 </settings-sync-page>
242 </settings-subpage> 241 </settings-subpage>
243 </template> 242 </template>
244 <if expr="chromeos"> 243 <if expr="chromeos">
245 <template is="dom-if" name="quick-unlock-authenticate"> 244 <template is="dom-if" name="quick-unlock-authenticate">
246 <settings-subpage page-title="$i18n{quickUnlockTitle}"> 245 <settings-subpage page-title="$i18n{quickUnlockTitle}">
247 <settings-quick-unlock-authenticate 246 <settings-quick-unlock-authenticate
248 set-modes="{{quickUnlockSetModes}}" 247 set-modes="{{quickUnlockSetModes}}" profile-name="[[profileName_]]">
Dan Beam 2016/08/05 18:25:18 nit: indent off
tommycli 2016/08/05 18:54:05 Done.
249 current-route="{{currentRoute}}"
250 profile-name="[[profileName_]]">
251 </settings-quick-unlock-authenticate> 248 </settings-quick-unlock-authenticate>
252 </settings-subpage> 249 </settings-subpage>
253 </template> 250 </template>
254 <template is="dom-if" name="quick-unlock-choose-method"> 251 <template is="dom-if" name="quick-unlock-choose-method">
255 <settings-subpage page-title="$i18n{quickUnlockTitle}"> 252 <settings-subpage page-title="$i18n{quickUnlockTitle}">
256 <settings-quick-unlock-choose-method 253 <settings-quick-unlock-choose-method
257 set-modes="[[quickUnlockSetModes]]" 254 set-modes="[[quickUnlockSetModes]]" prefs="{{prefs}}">
258 current-route="{{currentRoute}}"
259 prefs="{{prefs}}">
260 </settings-quick-unlock-choose-method> 255 </settings-quick-unlock-choose-method>
261 </settings-subpage> 256 </settings-subpage>
262 </template> 257 </template>
263 <template is="dom-if" name="quick-unlock-setup-pin"> 258 <template is="dom-if" name="quick-unlock-setup-pin">
264 <settings-subpage page-title="$i18n{quickUnlockTitle}"> 259 <settings-subpage page-title="$i18n{quickUnlockTitle}">
265 <settings-quick-unlock-setup-pin 260 <settings-quick-unlock-setup-pin set-modes="[[quickUnlockSetModes]]">
266 set-modes="[[quickUnlockSetModes]]"
267 current-route="{{currentRoute}}">
268 </settings-quick-unlock-setup-pin> 261 </settings-quick-unlock-setup-pin>
269 </settings-subpage> 262 </settings-subpage>
270 </template> 263 </template>
271 <template is="dom-if" name="users"> 264 <template is="dom-if" name="users">
272 <settings-subpage page-title="$i18n{usersPageTitle}"> 265 <settings-subpage page-title="$i18n{usersPageTitle}">
273 <settings-users-page prefs="{{prefs}}"></settings-users-page> 266 <settings-users-page prefs="{{prefs}}"></settings-users-page>
274 </settings-subpage> 267 </settings-subpage>
275 </template> 268 </template>
276 <template is="dom-if" name="changePicture"> 269 <template is="dom-if" name="changePicture">
277 <settings-subpage page-title="$i18n{changePictureTitle}"> 270 <settings-subpage page-title="$i18n{changePictureTitle}">
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
318 311
319 <if expr="chromeos"> 312 <if expr="chromeos">
320 <template is="dom-if" if="[[easyUnlockEnabled_]]"> 313 <template is="dom-if" if="[[easyUnlockEnabled_]]">
321 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> 314 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog">
322 </easy-unlock-turn-off-dialog> 315 </easy-unlock-turn-off-dialog>
323 </template> 316 </template>
324 </if> 317 </if>
325 </template> 318 </template>
326 <script src="people_page.js"></script> 319 <script src="people_page.js"></script>
327 </dom-module> 320 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698