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

Unified Diff: chrome/browser/chromeos/login/existing_user_controller.h

Issue 12704002: Support for auth code based authentication flow for both app and web UI driven flow. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/chromeos/login/existing_user_controller.h
diff --git a/chrome/browser/chromeos/login/existing_user_controller.h b/chrome/browser/chromeos/login/existing_user_controller.h
index 6d5300191a188a1e745b2a4d082af5dac796d747..525a52cf5b0ee20db0f757eaf92c323bc9f7a290 100644
--- a/chrome/browser/chromeos/login/existing_user_controller.h
+++ b/chrome/browser/chromeos/login/existing_user_controller.h
@@ -79,11 +79,9 @@ class ExistingUserController : public LoginDisplay::Delegate,
virtual void CreateAccount() OVERRIDE;
virtual void CreateLocallyManagedUser(const string16& display_name,
const std::string& password) OVERRIDE;
- virtual void CompleteLogin(const std::string& username,
- const std::string& password) OVERRIDE;
+ virtual void CompleteLogin(const UserCredentials& credentials) OVERRIDE;
virtual string16 GetConnectedNetworkName() OVERRIDE;
- virtual void Login(const std::string& username,
- const std::string& password) OVERRIDE;
+ virtual void Login(const UserCredentials& credentials) OVERRIDE;
virtual void MigrateUserData(const std::string& old_password) OVERRIDE;
virtual void LoginAsRetailModeUser() OVERRIDE;
virtual void LoginAsGuest() OVERRIDE;
@@ -135,8 +133,7 @@ class ExistingUserController : public LoginDisplay::Delegate,
// LoginPerformer::Delegate implementation:
virtual void OnLoginFailure(const LoginFailure& error) OVERRIDE;
virtual void OnLoginSuccess(
- const std::string& username,
- const std::string& password,
+ const UserCredentials& credentials,
bool pending_requests,
bool using_oauth) OVERRIDE;
virtual void OnOffTheRecordLoginSuccess() OVERRIDE;
@@ -193,16 +190,14 @@ class ExistingUserController : public LoginDisplay::Delegate,
// Invoked to complete login. Login might be suspended if auto-enrollment
// has to be performed, and will resume once auto-enrollment completes.
void CompleteLoginInternal(
- const std::string& username,
- const std::string& password,
+ const UserCredentials& credentials,
DeviceSettingsService::OwnershipStatus ownership_status,
bool is_owner);
// Creates |login_performer_| if necessary and calls login() on it.
// The string arguments aren't passed by const reference because this is
// posted as |resume_login_callback_| and resets it.
- void PerformLogin(std::string username,
- std::string password,
+ void PerformLogin(const UserCredentials& credentials,
LoginPerformer::AuthorizationMode auth_mode);
void set_login_performer_delegate(LoginPerformer::Delegate* d) {

Powered by Google App Engine
This is Rietveld 408576698