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

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

Issue 1900913002: Settings People Revamp: Split Profile Info out into its own handler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 8 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/i18n_behavior.html">
2 <link rel="import" href="chrome://resources/html/polymer.html"> 1 <link rel="import" href="chrome://resources/html/polymer.html">
3 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 2 <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"> 3 <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"> 4 <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"> 5 <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-dialog/paper-dial og.html"> 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial og.html">
7 <link rel="import" href="chrome://md-settings/i18n_setup.html">
8 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html"> 8 <link rel="import" href="chrome://md-settings/controls/settings_checkbox.html">
9 <link rel="import" href="chrome://md-settings/people_page/sync_page.html"> 9 <link rel="import" href="chrome://md-settings/people_page/sync_page.html">
10 <link rel="import" href="chrome://md-settings/people_page/profile_info_browser_p roxy.html">
10 <link rel="import" href="chrome://md-settings/people_page/sync_private_api.html" > 11 <link rel="import" href="chrome://md-settings/people_page/sync_private_api.html" >
11 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html"> 12 <link rel="import" href="chrome://md-settings/settings_page/settings_animated_pa ges.html">
12 <link rel="import" href="chrome://md-settings/settings_page/settings_subpage.htm l"> 13 <link rel="import" href="chrome://md-settings/settings_page/settings_subpage.htm l">
13 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> 14 <link rel="import" href="chrome://md-settings/settings_shared_css.html">
14 15
15 <if expr="chromeos"> 16 <if expr="chromeos">
16 <link rel="import" href="chrome://md-settings/people_page/change_picture.html"> 17 <link rel="import" href="chrome://md-settings/people_page/change_picture.html">
17 <link rel="import" href="chrome://md-settings/people_page/easy_unlock_browser_pr oxy.html"> 18 <link rel="import" href="chrome://md-settings/people_page/easy_unlock_browser_pr oxy.html">
18 <link rel="import" href="chrome://md-settings/people_page/easy_unlock_turn_off_d ialog.html"> 19 <link rel="import" href="chrome://md-settings/people_page/easy_unlock_turn_off_d ialog.html">
19 <link rel="import" href="chrome://md-settings/people_page/users_page.html"> 20 <link rel="import" href="chrome://md-settings/people_page/users_page.html">
20 </if> 21 </if>
21 <if expr="not chromeos"> 22 <if expr="not chromeos">
22 <link rel="import" href="chrome://md-settings/people_page/manage_profile.html"> 23 <link rel="import" href="chrome://md-settings/people_page/manage_profile.html">
23 </if> 24 </if>
24 25
25 <dom-module id="settings-people-page"> 26 <dom-module id="settings-people-page">
26 <template> 27 <template>
27 <style include="settings-shared"> 28 <style include="settings-shared">
28 #account-picture { 29 #profile-icon {
29 -webkit-margin-end: 4px; 30 -webkit-margin-end: 4px;
30 border-radius: 20px; 31 border-radius: 20px;
31 height: 40px; 32 height: 40px;
32 object-fit: cover; 33 object-fit: cover;
33 vertical-align: middle; 34 vertical-align: middle;
34 width: 40px; 35 width: 40px;
35 } 36 }
36 37
37 #account-picture:hover { 38 #profile-icon:hover {
38 cursor: pointer; 39 cursor: pointer;
39 } 40 }
40 41
41 <if expr="not chromeos"> 42 <if expr="not chromeos">
42 #profile-name:hover { 43 #profile-name:hover {
43 cursor: pointer; 44 cursor: pointer;
44 } 45 }
45 </if> 46 </if>
46 </style> 47 </style>
47 <settings-animated-pages id="pages" current-route="{{currentRoute}}" 48 <settings-animated-pages id="pages" current-route="{{currentRoute}}"
48 section="people"> 49 section="people">
49 <neon-animatable id="main"> 50 <neon-animatable id="main">
50 <div class="settings-box first two-line"> 51 <div class="settings-box first two-line">
51 <img id="account-picture" src="[[profileIconUrl_]]" 52 <img id="profile-icon" src="[[profileIconUrl_]]"
52 on-tap="onPictureTap_"> 53 on-tap="onPictureTap_">
53 <div class="middle"> 54 <div class="middle">
54 <if expr="chromeos"> 55 <if expr="chromeos">
55 <span id="profile-name" on-tap="onProfileNameTap_"> 56 <span id="profile-name" on-tap="onProfileNameTap_">
56 [[profileName_]] 57 [[profileName_]]
57 </span> 58 </span>
58 </if> 59 </if>
59 <if expr="not chromeos"> 60 <if expr="not chromeos">
60 <span id="profile-name"> 61 <span id="profile-name">
61 [[profileName_]] 62 [[profileName_]]
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
203 204
204 <if expr="chromeos"> 205 <if expr="chromeos">
205 <template is="dom-if" if="[[easyUnlockEnabled_]]"> 206 <template is="dom-if" if="[[easyUnlockEnabled_]]">
206 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"> 207 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog">
207 </easy-unlock-turn-off-dialog> 208 </easy-unlock-turn-off-dialog>
208 </template> 209 </template>
209 </if> 210 </if>
210 </template> 211 </template>
211 <script src="people_page.js"></script> 212 <script src="people_page.js"></script>
212 </dom-module> 213 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698