Added multi-login support to one-click signin.

chrome/browser/signin/signin_manager.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/signin/signin_manager.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "chrome/browser/content_settings/cookie_settings.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/signin/token_service.h"
 #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"
 #include "net/base/cookie_monster.h"
 
 const char kGetInfoEmailKey[] = "email";
 const char kGetInfoServicesKey[] = "allServices";
 const char kGooglePlusServiceKey[] = "googleme";
 
 const char kGoogleAccountsUrl[] = "https://accounts.google.com";
@@ skipping 115 matching lines @@
                                           GaiaConstants::kChromeSource,
                                           profile_->GetRequestContext()));
   client_login_->StartClientLogin(possibly_invalid_username_,
                                   access_code,
                                   "",
                                   std::string(),
                                   std::string(),
                                   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();
   possibly_invalid_username_.assign(username);
   password_.assign(password);
 
   client_login_.reset(new GaiaAuthFetcher(this,
                                           GaiaConstants::kChromeSource,
                                           profile_->GetRequestContext()));
 
   // This function starts with the current state of the web session's cookie
   // jar and mints a new ClientLogin-style SID/LSID pair.  This involves going
   // throug the follow process or requests to GAIA and LSO:
   //
   // - call /o/oauth2/programmatic_auth with the returned token to get oauth2
   //   access and refresh tokens
   // - call /accounts/OAuthLogin with the oauth2 access token and get an uber
   //   auth token
   // - call /TokenAuth with the uber auth token to get a SID/LSID pair for use
   //   by the token service
   //
   // 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() {
   DCHECK(IsInitialized());
 
   CleanupNotificationRegistration();
   client_login_.reset();
   last_result_ = ClientLoginResult();
   possibly_invalid_username_.clear();
   password_.clear();
@@ skipping 191 matching lines @@
                                               profile_->GetRequestContext()));
     }
 
     client_login_->StartMergeSession(tok_details->token());
 
     // We only want to do this once per sign-in.
     CleanupNotificationRegistration();
   }
 #endif
 }