| Index: chrome/browser/chromeos/login/signin/oauth2_login_manager.h
|
| diff --git a/chrome/browser/chromeos/login/signin/oauth2_login_manager.h b/chrome/browser/chromeos/login/signin/oauth2_login_manager.h
|
| index cf06ef024f960d7a9c86730f2fc16e8ec1186ae0..f6b50c3e4f1d3628c58278800d64c901f8f7ed55 100644
|
| --- a/chrome/browser/chromeos/login/signin/oauth2_login_manager.h
|
| +++ b/chrome/browser/chromeos/login/signin/oauth2_login_manager.h
|
| @@ -14,7 +14,6 @@
|
| #include "chrome/browser/chromeos/login/signin/oauth2_login_verifier.h"
|
| #include "chrome/browser/chromeos/login/signin/oauth2_token_fetcher.h"
|
| #include "components/keyed_service/core/keyed_service.h"
|
| -#include "google_apis/gaia/gaia_oauth_client.h"
|
| #include "google_apis/gaia/oauth2_token_service.h"
|
| #include "net/url_request/url_request_context_getter.h"
|
|
|
| @@ -27,7 +26,6 @@ namespace chromeos {
|
| // This class is responsible for restoring authenticated web sessions out of
|
| // OAuth2 refresh tokens or pre-authenticated cookie jar.
|
| class OAuth2LoginManager : public KeyedService,
|
| - public gaia::GaiaOAuthClient::Delegate,
|
| public OAuth2LoginVerifier::Delegate,
|
| public OAuth2TokenFetcher::Delegate,
|
| public OAuth2TokenService::Observer {
|
| @@ -146,14 +144,6 @@ class OAuth2LoginManager : public KeyedService,
|
| // KeyedService implementation.
|
| void Shutdown() override;
|
|
|
| - // gaia::GaiaOAuthClient::Delegate overrides.
|
| - void OnRefreshTokenResponse(const std::string& access_token,
|
| - int expires_in_seconds) override;
|
| - void OnGetUserInfoResponse(
|
| - std::unique_ptr<base::DictionaryValue> user_info) override;
|
| - void OnOAuthError() override;
|
| - void OnNetworkError(int response_code) override;
|
| -
|
| // OAuth2LoginVerifier::Delegate overrides.
|
| void OnSessionMergeSuccess() override;
|
| void OnSessionMergeFailure(bool connection_error) override;
|
| @@ -177,7 +167,7 @@ class OAuth2LoginManager : public KeyedService,
|
| ProfileOAuth2TokenService* GetTokenService();
|
|
|
| // Retrieves the primary account for |user_profile_|.
|
| - const std::string& GetPrimaryAccountId();
|
| + std::string GetPrimaryAccountId();
|
|
|
| // Records |refresh_token_| to token service. The associated account id is
|
| // assumed to be the primary account id of the user profile. If the primary
|
| @@ -185,9 +175,6 @@ class OAuth2LoginManager : public KeyedService,
|
| // retrieve the associated account info.
|
| void StoreOAuth2Token();
|
|
|
| - // Get the account info corresponding to the specified refresh token.
|
| - void GetAccountInfoOfRefreshToken(const std::string& refresh_token);
|
| -
|
| // Update the token service and inform listeners of a new refresh token.
|
| void UpdateCredentials(const std::string& account_id);
|
|
|
| @@ -240,7 +227,6 @@ class OAuth2LoginManager : public KeyedService,
|
|
|
| std::unique_ptr<OAuth2TokenFetcher> oauth2_token_fetcher_;
|
| std::unique_ptr<OAuth2LoginVerifier> login_verifier_;
|
| - std::unique_ptr<gaia::GaiaOAuthClient> account_info_fetcher_;
|
|
|
| // OAuth2 refresh token.
|
| std::string refresh_token_;
|
|
|