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

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

Issue 2920853004: [sync] Display an error when sync settings aren't confirmed (Closed)
Patch Set: Reformat, remove browser_options change Created 3 years, 6 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 302 matching lines...) Expand 10 before | Expand all | Expand 10 after
313 // prompt them to sign back in. 313 // prompt them to sign back in.
314 this.syncBrowserProxy_.signOut(false); 314 this.syncBrowserProxy_.signOut(false);
315 this.syncBrowserProxy_.startSignIn(); 315 this.syncBrowserProxy_.startSignIn();
316 } 316 }
317 // </if> 317 // </if>
318 break; 318 break;
319 case settings.StatusAction.UPGRADE_CLIENT: 319 case settings.StatusAction.UPGRADE_CLIENT:
320 settings.navigateTo(settings.Route.ABOUT); 320 settings.navigateTo(settings.Route.ABOUT);
321 break; 321 break;
322 case settings.StatusAction.ENTER_PASSPHRASE: 322 case settings.StatusAction.ENTER_PASSPHRASE:
323 case settings.StatusAction.CONFIRM_SYNC_SETTINGS:
323 case settings.StatusAction.NO_ACTION: 324 case settings.StatusAction.NO_ACTION:
324 default: 325 default:
325 settings.navigateTo(settings.Route.SYNC); 326 settings.navigateTo(settings.Route.SYNC);
326 } 327 }
327 }, 328 },
328 329
329 // <if expr="chromeos"> 330 // <if expr="chromeos">
330 /** 331 /**
331 * @param {!Event} e 332 * @param {!Event} e
332 * @private 333 * @private
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
453 454
454 /** 455 /**
455 * @param {!settings.SyncStatus} syncStatus 456 * @param {!settings.SyncStatus} syncStatus
456 * @return {boolean} Whether to show the "Sign in to Chrome" button. 457 * @return {boolean} Whether to show the "Sign in to Chrome" button.
457 * @private 458 * @private
458 */ 459 */
459 showSignin_: function(syncStatus) { 460 showSignin_: function(syncStatus) {
460 return !!syncStatus.signinAllowed && !syncStatus.signedIn; 461 return !!syncStatus.signinAllowed && !syncStatus.signedIn;
461 }, 462 },
462 }); 463 });
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/resources/settings/people_page/sync_browser_proxy.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698