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

Side by Side Diff: chrome/browser/resources/sync_setup_overlay.js

Issue 10211009: Fix build failure from a bad merge. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 <include src="../shared/js/util.js"></include>
6
7 cr.define('options', function() { 5 cr.define('options', function() {
8 /** @const */ var OptionsPage = options.OptionsPage; 6 /** @const */ var OptionsPage = options.OptionsPage;
9 7
10 // Variable to track if a captcha challenge was issued. If this gets set to 8 // Variable to track if a captcha challenge was issued. If this gets set to
11 // true, it stays that way until we are told about successful login from 9 // true, it stays that way until we are told about successful login from
12 // the browser. This means subsequent errors (like invalid password) are 10 // the browser. This means subsequent errors (like invalid password) are
13 // rendered in the captcha state, which is basically identical except we 11 // rendered in the captcha state, which is basically identical except we
14 // don't show the top error blurb 'Error Signing in' or the 'Create 12 // don't show the top error blurb 'Error Signing in' or the 'Create
15 // account' link. 13 // account' link.
16 var captchaChallengeActive_ = false; 14 var captchaChallengeActive_ = false;
(...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after
890 888
891 SyncSetupOverlay.showStopSyncingUI = function() { 889 SyncSetupOverlay.showStopSyncingUI = function() {
892 SyncSetupOverlay.getInstance().showStopSyncingUI_(); 890 SyncSetupOverlay.getInstance().showStopSyncingUI_();
893 }; 891 };
894 892
895 // Export 893 // Export
896 return { 894 return {
897 SyncSetupOverlay: SyncSetupOverlay 895 SyncSetupOverlay: SyncSetupOverlay
898 }; 896 };
899 }); 897 });
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698