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

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

Issue 2091143002: Add the authenticate screen for the quick unlock settings. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@pin-unlock-settings-keyboard-fixes
Patch Set: Comments & run closure compiler Created 4 years, 5 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 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 /** 5 /**
6 * @fileoverview 6 * @fileoverview
7 * 'settings-people-page' is the settings page containing sign-in settings. 7 * 'settings-people-page' is the settings page containing sign-in settings.
8 */ 8 */
9 Polymer({ 9 Polymer({
10 is: 'settings-people-page', 10 is: 'settings-people-page',
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 /** @private {!settings.SyncBrowserProxyImpl} */ 54 /** @private {!settings.SyncBrowserProxyImpl} */
55 syncBrowserProxy_: { 55 syncBrowserProxy_: {
56 type: Object, 56 type: Object,
57 value: function() { 57 value: function() {
58 return settings.SyncBrowserProxyImpl.getInstance(); 58 return settings.SyncBrowserProxyImpl.getInstance();
59 }, 59 },
60 }, 60 },
61 61
62 <if expr="chromeos"> 62 <if expr="chromeos">
63 /** 63 /**
64 * True if Pin Unlock is allowed on this machine. 64 * True if quick unlock settings should be displayed on this machine.
65 * @private
65 */ 66 */
66 pinUnlockAllowed_: { 67 quickUnlockAllowed_: {
67 type: Boolean, 68 type: Boolean,
68 value: function() { 69 // TODO(jdufault): Get a real value via quickUnlockPrivate API.
69 /* TODO(jdufault): Return a real value via quickUnlockPrivate API. */ 70 value: false,
70 return false;
71 },
72 readOnly: true, 71 readOnly: true,
73 }, 72 },
74 73
75 /** @private {!settings.EasyUnlockBrowserProxyImpl} */ 74 /** @private {!settings.EasyUnlockBrowserProxyImpl} */
76 easyUnlockBrowserProxy_: { 75 easyUnlockBrowserProxy_: {
77 type: Object, 76 type: Object,
78 value: function() { 77 value: function() {
79 return settings.EasyUnlockBrowserProxyImpl.getInstance(); 78 return settings.EasyUnlockBrowserProxyImpl.getInstance();
80 }, 79 },
81 }, 80 },
(...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after
227 assert(this.syncStatus.syncSystemEnabled); 226 assert(this.syncStatus.syncSystemEnabled);
228 227
229 if (this.syncStatus.managed) 228 if (this.syncStatus.managed)
230 return; 229 return;
231 230
232 this.$.pages.setSubpageChain(['sync']); 231 this.$.pages.setSubpageChain(['sync']);
233 }, 232 },
234 233
235 <if expr="chromeos"> 234 <if expr="chromeos">
236 /** @private */ 235 /** @private */
236 onQuickUnlockTap_: function() {
237 this.$.pages.setSubpageChain(['quick-unlock-authenticate']);
238 },
239
240 /** @private */
237 onEasyUnlockSetupTap_: function() { 241 onEasyUnlockSetupTap_: function() {
238 this.easyUnlockBrowserProxy_.startTurnOnFlow(); 242 this.easyUnlockBrowserProxy_.startTurnOnFlow();
239 }, 243 },
240 244
241 /** @private */ 245 /** @private */
242 onEasyUnlockTurnOffTap_: function() { 246 onEasyUnlockTurnOffTap_: function() {
243 this.$$('#easyUnlockTurnOffDialog').open(); 247 this.$$('#easyUnlockTurnOffDialog').open();
244 }, 248 },
245 </if> 249 </if>
246 250
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
291 if (!syncStatus) 295 if (!syncStatus)
292 return ''; 296 return '';
293 if (syncStatus.hasError) 297 if (syncStatus.hasError)
294 return 'settings:sync-problem'; 298 return 'settings:sync-problem';
295 if (syncStatus.managed) 299 if (syncStatus.managed)
296 return 'settings:sync-disabled'; 300 return 'settings:sync-disabled';
297 301
298 return 'settings:done'; 302 return 'settings:done';
299 }, 303 },
300 }); 304 });
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698