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

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: fix merge 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 id="picture-subpage-trigger" class="settings-box first two-line"> 77 <div id="picture-subpage-trigger" 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 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
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 238 <settings-subpage
240 associated-control="[[$$('#customize-sync')]]" 239 associated-control="[[$$('#customize-sync')]]"
241 page-title="$i18n{syncPageTitle}"> 240 page-title="$i18n{syncPageTitle}">
242 <settings-sync-page current-route="[[currentRoute]]"> 241 <settings-sync-page></settings-sync-page>
243 </settings-sync-page>
244 </settings-subpage> 242 </settings-subpage>
245 </template> 243 </template>
246 <if expr="chromeos"> 244 <if expr="chromeos">
247 <template is="dom-if" name="quick-unlock-authenticate"> 245 <template is="dom-if" name="quick-unlock-authenticate">
248 <settings-subpage 246 <settings-subpage
249 associated-control="[[$$('#quick-unlock-subpage-trigger')]]" 247 associated-control="[[$$('#quick-unlock-subpage-trigger')]]"
250 page-title="$i18n{quickUnlockTitle}"> 248 page-title="$i18n{quickUnlockTitle}">
251 <settings-quick-unlock-authenticate 249 <settings-quick-unlock-authenticate
252 set-modes="{{quickUnlockSetModes}}" 250 set-modes="{{quickUnlockSetModes}}"
253 current-route="{{currentRoute}}" 251 profile-name="[[profileName_]]">
254 profile-name="[[profileName_]]">
255 </settings-quick-unlock-authenticate> 252 </settings-quick-unlock-authenticate>
256 </settings-subpage> 253 </settings-subpage>
257 </template> 254 </template>
258 <template is="dom-if" name="quick-unlock-choose-method"> 255 <template is="dom-if" name="quick-unlock-choose-method">
259 <settings-subpage no-associated-control 256 <settings-subpage no-associated-control
260 page-title="$i18n{quickUnlockTitle}"> 257 page-title="$i18n{quickUnlockTitle}">
261 <settings-quick-unlock-choose-method 258 <settings-quick-unlock-choose-method
262 set-modes="[[quickUnlockSetModes]]" 259 set-modes="[[quickUnlockSetModes]]" prefs="{{prefs}}">
263 current-route="{{currentRoute}}"
264 prefs="{{prefs}}">
265 </settings-quick-unlock-choose-method> 260 </settings-quick-unlock-choose-method>
266 </settings-subpage> 261 </settings-subpage>
267 </template> 262 </template>
268 <template is="dom-if" name="quick-unlock-setup-pin"> 263 <template is="dom-if" name="quick-unlock-setup-pin">
269 <settings-subpage no-associated-control 264 <settings-subpage no-associated-control
270 page-title="$i18n{quickUnlockTitle}"> 265 page-title="$i18n{quickUnlockTitle}">
271 <settings-quick-unlock-setup-pin 266 <settings-quick-unlock-setup-pin set-modes="[[quickUnlockSetModes]]">
272 set-modes="[[quickUnlockSetModes]]"
273 current-route="{{currentRoute}}">
274 </settings-quick-unlock-setup-pin> 267 </settings-quick-unlock-setup-pin>
275 </settings-subpage> 268 </settings-subpage>
276 </template> 269 </template>
277 <template is="dom-if" name="users"> 270 <template is="dom-if" name="users">
278 <settings-subpage 271 <settings-subpage
279 associated-control="[[$$('#manage-other-people-subpage-trigger')]]" 272 associated-control="[[$$('#manage-other-people-subpage-trigger')]]"
280 page-title="$i18n{usersPageTitle}"> 273 page-title="$i18n{usersPageTitle}">
281 <settings-users-page prefs="{{prefs}}"></settings-users-page> 274 <settings-users-page prefs="{{prefs}}"></settings-users-page>
282 </settings-subpage> 275 </settings-subpage>
283 </template> 276 </template>
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
330 323
331 <if expr="chromeos"> 324 <if expr="chromeos">
332 <template is="dom-if" if="[[easyUnlockEnabled_]]"> 325 <template is="dom-if" if="[[easyUnlockEnabled_]]">
333 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> 326 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog">
334 </easy-unlock-turn-off-dialog> 327 </easy-unlock-turn-off-dialog>
335 </template> 328 </template>
336 </if> 329 </if>
337 </template> 330 </template>
338 <script src="people_page.js"></script> 331 <script src="people_page.js"></script>
339 </dom-module> 332 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698