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

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

Issue 1806123002: Settings People Revamp: Easy Unlock: Add browser proxy and setup flow. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 9 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"> 1 <link rel="import" href="chrome://resources/html/i18n_behavior.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/polymer/v1_0/paper-dialog/paper-dial og.html"> 7 <link rel="import" href="chrome://resources/polymer/v1_0/paper-dialog/paper-dial og.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/sync_private_api.html" > 10 <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"> 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_subheader.h tml"> 12 <link rel="import" href="chrome://md-settings/settings_page/settings_subheader.h tml">
13 <link rel="import" href="chrome://md-settings/settings_shared_css.html"> 13 <link rel="import" href="chrome://md-settings/settings_shared_css.html">
14 14
15 <if expr="chromeos"> 15 <if expr="chromeos">
16 <link rel="import" href="chrome://md-settings/people_page/change_picture.html"> 16 <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">
17 <link rel="import" href="chrome://md-settings/people_page/users_page.html"> 18 <link rel="import" href="chrome://md-settings/people_page/users_page.html">
18 </if> 19 </if>
19 <if expr="not chromeos"> 20 <if expr="not chromeos">
20 <link rel="import" href="chrome://md-settings/people_page/manage_profile.html"> 21 <link rel="import" href="chrome://md-settings/people_page/manage_profile.html">
21 </if> 22 </if>
22 23
23 <dom-module id="settings-people-page"> 24 <dom-module id="settings-people-page">
24 <link rel="import" type="css" href="people_page.css"> 25 <link rel="import" type="css" href="people_page.css">
25 <template> 26 <template>
26 <style include="settings-shared"></style> 27 <style include="settings-shared"></style>
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
96 </template> 97 </template>
97 <template is="dom-if" if=[[easyUnlockEnabled_]]> 98 <template is="dom-if" if=[[easyUnlockEnabled_]]>
98 [[i18n('easyUnlockDescription')]] 99 [[i18n('easyUnlockDescription')]]
99 </template> 100 </template>
100 <a target="_blank" href$="[[i18n('easyUnlockLearnMoreURL')]]"> 101 <a target="_blank" href$="[[i18n('easyUnlockLearnMoreURL')]]">
101 [[i18n('learnMore')]] 102 [[i18n('learnMore')]]
102 </a> 103 </a>
103 </div> 104 </div>
104 </div> 105 </div>
105 <div class="secondary-action"> 106 <div class="secondary-action">
106 <!-- TODO(tommycli): Hook up these buttons to actions. -->
107 <template is="dom-if" if=[[!easyUnlockEnabled_]]> 107 <template is="dom-if" if=[[!easyUnlockEnabled_]]>
108 <paper-button class="secondary-button"> 108 <paper-button class="secondary-button"
109 on-tap="onEasyUnlockSetupTap_">
109 [[i18n('easyUnlockSetupButton')]] 110 [[i18n('easyUnlockSetupButton')]]
110 </paper-button> 111 </paper-button>
111 </template> 112 </template>
112 <template is="dom-if" if=[[easyUnlockEnabled_]]> 113 <template is="dom-if" if=[[easyUnlockEnabled_]]>
113 <paper-button class="secondary-button"> 114 <paper-button class="secondary-button"
115 on-tap="onEasyUnlockTurnOffTap_">
114 [[i18n('easyUnlockTurnOffButton')]] 116 [[i18n('easyUnlockTurnOffButton')]]
115 </paper-button> 117 </paper-button>
116 </template> 118 </template>
117 </div> 119 </div>
118 </div> 120 </div>
119 </template> 121 </template>
120 </if> 122 </if>
121 123
122 <div class="settings-box"> 124 <div class="settings-box">
123 <paper-button class="primary-button" i18n-content="manageOtherPeople" 125 <paper-button class="primary-button" i18n-content="manageOtherPeople"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
166 <paper-button dialog-dismiss i18n-content="cancel"> 168 <paper-button dialog-dismiss i18n-content="cancel">
167 </paper-button> 169 </paper-button>
168 <paper-button dialog-confirm class="action-button" 170 <paper-button dialog-confirm class="action-button"
169 on-tap="onDisconnectConfirm_" i18n-content="syncDisconnectConfirm"> 171 on-tap="onDisconnectConfirm_" i18n-content="syncDisconnectConfirm">
170 </paper-button> 172 </paper-button>
171 </div> 173 </div>
172 </paper-dialog> 174 </paper-dialog>
173 </template> 175 </template>
174 <script src="people_page.js"></script> 176 <script src="people_page.js"></script>
175 </dom-module> 177 </dom-module>
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698