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

Unified Diff: chrome/browser/signin/signin_manager.cc

Issue 9592015: Added multi-login support to one-click signin. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix member init order in ctor" Created 8 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
« no previous file with comments | « chrome/browser/signin/signin_manager.h ('k') | chrome/browser/signin/signin_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/signin_manager.cc
diff --git a/chrome/browser/signin/signin_manager.cc b/chrome/browser/signin/signin_manager.cc
index 222a0743bf8ba4d2c221a74486e13b9666d1a5ed..37958c9a95edea4ecccf7f80981c304509834715 100644
--- a/chrome/browser/signin/signin_manager.cc
+++ b/chrome/browser/signin/signin_manager.cc
@@ -17,6 +17,7 @@
#include "chrome/browser/sync/profile_sync_service.h"
#include "chrome/common/chrome_notification_types.h"
#include "chrome/common/chrome_switches.h"
+#include "chrome/common/net/gaia/gaia_auth_fetcher.h"
#include "chrome/common/net/gaia/gaia_constants.h"
#include "chrome/common/pref_names.h"
#include "content/public/browser/notification_service.h"
@@ -152,7 +153,8 @@ void SigninManager::ProvideSecondFactorAccessCode(
GaiaAuthFetcher::HostedAccountsNotAllowed);
}
-void SigninManager::StartSignInWithCredentials(const std::string& username,
+void SigninManager::StartSignInWithCredentials(const std::string& session_index,
+ const std::string& username,
const std::string& password) {
DCHECK(authenticated_username_.empty());
PrepareForSignin();
@@ -176,7 +178,7 @@ void SigninManager::StartSignInWithCredentials(const std::string& username,
//
// The resulting SID/LSID can then be used just as if
// client_login_->StartClientLogin() had completed successfully.
- client_login_->StartOAuthLoginTokenFetch("");
+ client_login_->StartOAuthLoginTokenFetchWithCookies(session_index);
}
void SigninManager::ClearTransientSigninData() {
« no previous file with comments | « chrome/browser/signin/signin_manager.h ('k') | chrome/browser/signin/signin_manager_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698