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

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

Issue 2805003005: MD Settings: Move Activity Controls link to Sync subpage (Closed)
Patch Set: remove an obsolete test Created 3 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/cr_elements/cr_dialog/cr_dialog.html "> 1 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html ">
2 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html"> 2 <link rel="import" href="chrome://resources/cr_elements/cr_expand_button/cr_expa nd_button.html">
3 <link rel="import" href="chrome://resources/cr_elements/icons.html"> 3 <link rel="import" href="chrome://resources/cr_elements/icons.html">
4 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> 4 <link rel="import" href="chrome://resources/html/i18n_behavior.html">
5 <link rel="import" href="chrome://resources/html/icon.html"> 5 <link rel="import" href="chrome://resources/html/icon.html">
6 <link rel="import" href="chrome://resources/html/polymer.html"> 6 <link rel="import" href="chrome://resources/html/polymer.html">
7 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html"> 7 <link rel="import" href="chrome://resources/html/web_ui_listener_behavior.html">
8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html"> 8 <link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-coll apse.html">
9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> 9 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html">
10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> 10 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html">
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 padding: 11px 0; 76 padding: 11px 0;
77 } 77 }
78 78
79 .icon-container { 79 .icon-container {
80 display: flex; 80 display: flex;
81 flex-shrink: 0; 81 flex-shrink: 0;
82 justify-content: center; 82 justify-content: center;
83 width: 40px; 83 width: 40px;
84 } 84 }
85 85
86 /* Avoid orphaned english text (as requested by bettes@) */
87 #activity-controls .secondary {
88 max-width: 90%;
89 }
90
91 #googleg-logo {
92 background-image: url(../../../../../ui/webui/resources/images/200-logo_ googleg.png);
93 background-size: cover;
94 height: 16px;
95 width: 16px;
96 }
97
98 #disconnectDialog .footer .settings-box { 86 #disconnectDialog .footer .settings-box {
99 --settings-box-row-padding: 0; 87 --settings-box-row-padding: 0;
100 } 88 }
101 89
102 .delete-profile-warning { 90 .delete-profile-warning {
103 /* In order to line up with the checkbox text. */ 91 /* In order to line up with the checkbox text. */
104 -webkit-padding-start: 36px; 92 -webkit-padding-start: 36px;
105 padding-bottom: 10px; 93 padding-bottom: 10px;
106 padding-top: 10px; 94 padding-top: 10px;
107 } 95 }
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
197 id="syncSecondary"> 185 id="syncSecondary">
198 [[syncStatus.statusText]] 186 [[syncStatus.statusText]]
199 </div> 187 </div>
200 </div> 188 </div>
201 <button class="subpage-arrow" is="paper-icon-button-light" 189 <button class="subpage-arrow" is="paper-icon-button-light"
202 aria-label="$i18n{sync}" 190 aria-label="$i18n{sync}"
203 aria-describedby="syncSecondary"></button> 191 aria-describedby="syncSecondary"></button>
204 </div> 192 </div>
205 </template> 193 </template>
206 194
207 <div class="settings-box three-line" id="activity-controls"
208 on-tap="onActivityControlsTap_" actionable
209 hidden="[[!syncStatus.signedIn]]">
210 <div class="icon-container">
211 <div id="googleg-logo"></div>
212 </div>
213 <div class="middle">
214 $i18n{personalizeGoogleServicesTitle}
215 <div class="secondary" id="personalizeGoogleServicesSecondary">
216 $i18n{personalizeGoogleServicesText}
217 </div>
218 </div>
219 <button class="icon-external" is="paper-icon-button-light"
220 aria-label="$i18n{personalizeGoogleServicesTitle}"
221 aria-describedby="personalizeGoogleServicesSecondary"></button>
222 </div>
223
224 <if expr="chromeos"> 195 <if expr="chromeos">
225 <template is="dom-if" if="[[!quickUnlockEnabled_]]"> 196 <template is="dom-if" if="[[!quickUnlockEnabled_]]">
226 <div class="settings-box"> 197 <div class="settings-box">
227 <settings-toggle-button class="start" 198 <settings-toggle-button class="start"
228 pref="{{prefs.settings.enable_screen_lock}}" 199 pref="{{prefs.settings.enable_screen_lock}}"
229 label="$i18n{enableScreenlock}"> 200 label="$i18n{enableScreenlock}">
230 </settings-toggle-button> 201 </settings-toggle-button>
231 </div> 202 </div>
232 </template> 203 </template>
233 204
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
431 <if expr="chromeos"> 402 <if expr="chromeos">
432 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]"> 403 <template is="dom-if" if="[[showEasyUnlockTurnOffDialog_]]">
433 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog" 404 <easy-unlock-turn-off-dialog id="easyUnlockTurnOffDialog"
434 on-close="onEasyUnlockTurnOffDialogClose_"> 405 on-close="onEasyUnlockTurnOffDialogClose_">
435 </easy-unlock-turn-off-dialog> 406 </easy-unlock-turn-off-dialog>
436 </template> 407 </template>
437 </if> 408 </if>
438 </template> 409 </template>
439 <script src="people_page.js"></script> 410 <script src="people_page.js"></script>
440 </dom-module> 411 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698