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

Side by Side Diff: chrome/browser/extensions/api/identity/experimental_identity_api.cc

Issue 22581003: Handling of multiple concurrent requests from different clients in OAuth2TokenService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 4 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/extensions/api/identity/experimental_identity_api.h" 5 #include "chrome/browser/extensions/api/identity/experimental_identity_api.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 218 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 void ExperimentalIdentityGetAuthTokenFunction::StartLoginAccessTokenRequest() { 229 void ExperimentalIdentityGetAuthTokenFunction::StartLoginAccessTokenRequest() {
230 ProfileOAuth2TokenService* service = 230 ProfileOAuth2TokenService* service =
231 ProfileOAuth2TokenServiceFactory::GetForProfile(profile()); 231 ProfileOAuth2TokenServiceFactory::GetForProfile(profile());
232 #if defined(OS_CHROMEOS) 232 #if defined(OS_CHROMEOS)
233 if (chrome::IsRunningInForcedAppMode()) { 233 if (chrome::IsRunningInForcedAppMode()) {
234 std::string app_client_id; 234 std::string app_client_id;
235 std::string app_client_secret; 235 std::string app_client_secret;
236 if (chromeos::UserManager::Get()->GetAppModeChromeClientOAuthInfo( 236 if (chromeos::UserManager::Get()->GetAppModeChromeClientOAuthInfo(
237 &app_client_id, &app_client_secret)) { 237 &app_client_id, &app_client_secret)) {
238 login_token_request_ = 238 login_token_request_ =
239 service->StartRequestForClient(app_client_id, 239 service->StartRequestForClient(extension_->id(),
240 app_client_id,
240 app_client_secret, 241 app_client_secret,
241 OAuth2TokenService::ScopeSet(), 242 OAuth2TokenService::ScopeSet(),
242 this); 243 this);
243 return; 244 return;
244 } 245 }
245 } 246 }
246 #endif 247 #endif
247 login_token_request_ = service->StartRequest(OAuth2TokenService::ScopeSet(), 248 login_token_request_ = service->StartRequest(OAuth2TokenService::ScopeSet(),
248 this); 249 this);
249 } 250 }
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
391 } 392 }
392 } 393 }
393 394
394 void ExperimentalIdentityLaunchWebAuthFlowFunction:: 395 void ExperimentalIdentityLaunchWebAuthFlowFunction::
395 InitFinalRedirectURLPrefixesForTest(const std::string& extension_id) { 396 InitFinalRedirectURLPrefixesForTest(const std::string& extension_id) {
396 final_prefixes_.clear(); 397 final_prefixes_.clear();
397 InitFinalRedirectURLPrefixes(extension_id); 398 InitFinalRedirectURLPrefixes(extension_id);
398 } 399 }
399 400
400 } // namespace extensions 401 } // namespace extensions
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/extensions/api/identity/identity_api.cc » ('j') | chrome/browser/signin/oauth2_token_service.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698