diff options
| author | rickcam@chromium.org <rickcam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-03 21:58:51 +0000 |
|---|---|---|
| committer | rickcam@chromium.org <rickcam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-03 21:58:51 +0000 |
| commit | d912daad6fad6b47e6e3a392545db9de9b66be34 (patch) | |
| tree | d2aeec2185c514d7295fc2050933364424ef4c93 /chrome/browser/chromeos | |
| parent | de26b3c9a3bf2b88e1cdc69a172753cad7826064 (diff) | |
| download | chromium_src-d912daad6fad6b47e6e3a392545db9de9b66be34.zip chromium_src-d912daad6fad6b47e6e3a392545db9de9b66be34.tar.gz chromium_src-d912daad6fad6b47e6e3a392545db9de9b66be34.tar.bz2 | |
Adding service_name to GaiaOAuthFetcher
BUG=91434
TEST=unit tests
Review URL: http://codereview.chromium.org/7551026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95333 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/chromeos')
| -rw-r--r-- | chrome/browser/chromeos/login/login_utils.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/chromeos/login/online_attempt.cc | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/chrome/browser/chromeos/login/login_utils.cc b/chrome/browser/chromeos/login/login_utils.cc index 9db001e..b07b0e6d 100644 --- a/chrome/browser/chromeos/login/login_utils.cc +++ b/chrome/browser/chromeos/login/login_utils.cc @@ -156,6 +156,7 @@ class OAuthLoginVerifier : public GaiaOAuthConsumer { : oauth_fetcher_(this, user_profile->GetOffTheRecordProfile()->GetRequestContext(), user_profile->GetOffTheRecordProfile(), + GaiaConstants::kSyncService, kServiceScopeChromeOS), oauth1_token_(oauth1_token), oauth1_secret_(oauth1_secret) { @@ -200,6 +201,7 @@ class PolicyOAuthFetcher : public GaiaOAuthConsumer { : oauth_fetcher_(this, profile->GetRequestContext(), profile, + GaiaConstants::kDeviceManagementService, kServiceScopeChromeOSDeviceManagement), oauth1_token_(oauth1_token), oauth1_secret_(oauth1_secret) { @@ -210,11 +212,13 @@ class PolicyOAuthFetcher : public GaiaOAuthConsumer { void Start() { oauth_fetcher_.StartOAuthWrapBridge(oauth1_token_, oauth1_secret_, "3600", + std::string(GaiaConstants::kDeviceManagementService), std::string(kServiceScopeChromeOSDeviceManagement)); } // GaiaOAuthConsumer implementation: virtual void OnOAuthWrapBridgeSuccess( + const std::string& service_name, const std::string& token, const std::string& expires_in) OVERRIDE { policy::BrowserPolicyConnector* browser_policy_connector = @@ -565,6 +569,7 @@ void LoginUtilsImpl::FetchOAuth1AccessToken(Profile* auth_profile) { oauth_fetcher_.reset(new GaiaOAuthFetcher(this, auth_profile->GetRequestContext(), auth_profile, + GaiaConstants::kSyncService, kServiceScopeChromeOS)); // Let's first get the Oauth request token and OAuth1 token+secret. // One we get that, we will kick off individial requests for OAuth2 tokens for diff --git a/chrome/browser/chromeos/login/online_attempt.cc b/chrome/browser/chromeos/login/online_attempt.cc index f364eaf..1936e9d 100644 --- a/chrome/browser/chromeos/login/online_attempt.cc +++ b/chrome/browser/chromeos/login/online_attempt.cc @@ -63,6 +63,7 @@ void OnlineAttempt::Initiate(Profile* auth_profile) { new GaiaOAuthFetcher(this, auth_profile->GetRequestContext(), auth_profile, + GaiaConstants::kSyncService, kServiceScopeChromeOS)); } else { client_fetcher_.reset( |