diff options
| author | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-01 03:02:10 +0000 |
|---|---|---|
| committer | zelidrag@chromium.org <zelidrag@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-08-01 03:02:10 +0000 |
| commit | 98c7147a5a92b9c9ef0069c49a33eed8133ed812 (patch) | |
| tree | 769c72524d0a9af1dc73cebc234d7e1a835b4d6f /google_apis | |
| parent | d523467f140d3676c8d2598897b4829ef9d1a348 (diff) | |
| download | chromium_src-98c7147a5a92b9c9ef0069c49a33eed8133ed812.zip chromium_src-98c7147a5a92b9c9ef0069c49a33eed8133ed812.tar.gz chromium_src-98c7147a5a92b9c9ef0069c49a33eed8133ed812.tar.bz2 | |
Passed app-specific client id and secret to OAuth2TokenService
BUG=266183
TEST=kiosk tests
Review URL: https://chromiumcodereview.appspot.com/21164006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@214934 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_apis')
| -rw-r--r-- | google_apis/gaia/oauth2_api_call_flow.cc | 16 | ||||
| -rw-r--r-- | google_apis/gaia/oauth2_api_call_flow.h | 9 |
2 files changed, 2 insertions, 23 deletions
diff --git a/google_apis/gaia/oauth2_api_call_flow.cc b/google_apis/gaia/oauth2_api_call_flow.cc index 9f24b18..4c4940d 100644 --- a/google_apis/gaia/oauth2_api_call_flow.cc +++ b/google_apis/gaia/oauth2_api_call_flow.cc @@ -41,9 +41,6 @@ OAuth2ApiCallFlow::OAuth2ApiCallFlow( refresh_token_(refresh_token), access_token_(access_token), scopes_(scopes), - chrome_client_id_(GaiaUrls::GetInstance()->oauth2_chrome_client_id()), - chrome_client_secret_( - GaiaUrls::GetInstance()->oauth2_chrome_client_secret()), state_(INITIAL), tried_mint_access_token_(false) { } @@ -54,15 +51,6 @@ void OAuth2ApiCallFlow::Start() { BeginApiCall(); } -#if defined(OS_CHROMEOS) -void OAuth2ApiCallFlow::SetChromeOAuthClientInfo( - const std::string& chrome_client_id, - const std::string& chrome_client_secret) { - chrome_client_id_ = chrome_client_id; - chrome_client_secret_ = chrome_client_secret; -} -#endif - void OAuth2ApiCallFlow::BeginApiCall() { CHECK(state_ == INITIAL || state_ == MINT_ACCESS_TOKEN_DONE); @@ -118,8 +106,8 @@ void OAuth2ApiCallFlow::BeginMintAccessToken() { oauth2_access_token_fetcher_.reset(CreateAccessTokenFetcher()); oauth2_access_token_fetcher_->Start( - chrome_client_id_, - chrome_client_secret_, + GaiaUrls::GetInstance()->oauth2_chrome_client_id(), + GaiaUrls::GetInstance()->oauth2_chrome_client_secret(), refresh_token_, scopes_); } diff --git a/google_apis/gaia/oauth2_api_call_flow.h b/google_apis/gaia/oauth2_api_call_flow.h index fa7dd5c..fccd1e7 100644 --- a/google_apis/gaia/oauth2_api_call_flow.h +++ b/google_apis/gaia/oauth2_api_call_flow.h @@ -50,11 +50,6 @@ class OAuth2ApiCallFlow // Start the flow. virtual void Start(); -#if defined(OS_CHROMEOS) - void SetChromeOAuthClientInfo(const std::string& chrome_client_id, - const std::string& chrome_client_secret); -#endif - // OAuth2AccessTokenFetcher implementation. virtual void OnGetTokenSuccess(const std::string& access_token, const base::Time& expiration_time) OVERRIDE; @@ -118,10 +113,6 @@ class OAuth2ApiCallFlow std::string access_token_; std::vector<std::string> scopes_; - // Override values for the main chrome client id and secret. - std::string chrome_client_id_; - std::string chrome_client_secret_; - State state_; // Whether we have already tried minting an access token once. bool tried_mint_access_token_; |