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

Side by Side Diff: chrome/browser/signin/signin_manager.h

Issue 14029006: Properly handle user cancellation of signin. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 | chrome/browser/signin/signin_manager.cc » ('j') | 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 // The signin manager encapsulates some functionality tracking 5 // The signin manager encapsulates some functionality tracking
6 // which user is signed in. When a user is signed in, a ClientLogin 6 // which user is signed in. When a user is signed in, a ClientLogin
7 // request is run on their behalf. Auth tokens are fetched from Google 7 // request is run on their behalf. Auth tokens are fetched from Google
8 // and the results are stored in the TokenService. 8 // and the results are stored in the TokenService.
9 // 9 //
10 // **NOTE** on semantics of SigninManager: 10 // **NOTE** on semantics of SigninManager:
(...skipping 290 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 void TransferCredentialsToNewProfile(); 301 void TransferCredentialsToNewProfile();
302 302
303 // Helper function that loads policy with the passed CloudPolicyClient, then 303 // Helper function that loads policy with the passed CloudPolicyClient, then
304 // completes the signin process. 304 // completes the signin process.
305 void LoadPolicyWithCachedClient(); 305 void LoadPolicyWithCachedClient();
306 306
307 // Callback invoked once a profile is created, so we can complete the 307 // Callback invoked once a profile is created, so we can complete the
308 // credentials transfer and load policy. 308 // credentials transfer and load policy.
309 void CompleteSigninForNewProfile(Profile* profile, 309 void CompleteSigninForNewProfile(Profile* profile,
310 Profile::CreateStatus status); 310 Profile::CreateStatus status);
311
312 // Cancels the in-progress signin for this profile.
313 void CancelSignin();
311 #endif // defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS) 314 #endif // defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS)
312 315
313 // Invoked once policy has been loaded to complete user signin. 316 // Invoked once policy has been loaded to complete user signin.
314 void CompleteSigninAfterPolicyLoad(); 317 void CompleteSigninAfterPolicyLoad();
315 318
316 // ClientLogin identity. 319 // ClientLogin identity.
317 std::string possibly_invalid_username_; 320 std::string possibly_invalid_username_;
318 std::string password_; // This is kept empty whenever possible. 321 std::string password_; // This is kept empty whenever possible.
319 bool had_two_factor_error_; 322 bool had_two_factor_error_;
320 323
(...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
381 #if defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS) 384 #if defined(ENABLE_CONFIGURATION_POLICY) && !defined(OS_CHROMEOS)
382 // CloudPolicyClient reference we keep while determining whether to create 385 // CloudPolicyClient reference we keep while determining whether to create
383 // a new profile for an enterprise user or not. 386 // a new profile for an enterprise user or not.
384 scoped_ptr<policy::CloudPolicyClient> policy_client_; 387 scoped_ptr<policy::CloudPolicyClient> policy_client_;
385 #endif 388 #endif
386 389
387 DISALLOW_COPY_AND_ASSIGN(SigninManager); 390 DISALLOW_COPY_AND_ASSIGN(SigninManager);
388 }; 391 };
389 392
390 #endif // CHROME_BROWSER_SIGNIN_SIGNIN_MANAGER_H_ 393 #endif // CHROME_BROWSER_SIGNIN_SIGNIN_MANAGER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/signin/signin_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698