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

Unified Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

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: rebase4 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/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index 58c958ad1f6149f8ba648d2ffb62d25447238ddc..a912de276247a7ed86e5ae2b823a412aa2d6774d 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -145,10 +145,11 @@ class StubLogin : public LoginStatusConsumer,
authenticator_ = LoginUtils::Get()->CreateAuthenticator(this);
authenticator_.get()->AuthenticateToLogin(
g_browser_process->profile_manager()->GetDefaultProfile(),
- username,
- password,
- std::string(),
- std::string());
+ UserCredentials(username,
+ password,
+ std::string()), // auth_code
+ std::string(), // login_token
+ std::string()); // login_captcha
}
virtual ~StubLogin() {
@@ -160,18 +161,16 @@ class StubLogin : public LoginStatusConsumer,
delete this;
}
- virtual void OnLoginSuccess(const std::string& username,
- const std::string& password,
+ virtual void OnLoginSuccess(const UserCredentials& credentials,
bool pending_requests,
bool using_oauth) OVERRIDE {
pending_requests_ = pending_requests;
if (!profile_prepared_) {
// Will call OnProfilePrepared in the end.
- LoginUtils::Get()->PrepareProfile(username,
- std::string(),
- password,
+ LoginUtils::Get()->PrepareProfile(credentials,
+ std::string(), // display_email
using_oauth,
- false,
+ false, // has_cookies
this);
} else if (!pending_requests) {
delete this;
« no previous file with comments | « chrome/browser/chromeos/app_mode/kiosk_app_launcher.cc ('k') | chrome/browser/chromeos/login/auth_attempt_state.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698