| Index: chrome/browser/net/gaia/gaia_oauth_fetcher.h
|
| diff --git a/chrome/browser/net/gaia/gaia_oauth_fetcher.h b/chrome/browser/net/gaia/gaia_oauth_fetcher.h
|
| index 46389ca3b9c4a5ada458aaeabd14105b96b23951..da34d9947dd2b27c598c44e626b9f23d8704dc0f 100644
|
| --- a/chrome/browser/net/gaia/gaia_oauth_fetcher.h
|
| +++ b/chrome/browser/net/gaia/gaia_oauth_fetcher.h
|
| @@ -47,9 +47,10 @@ class GaiaOAuthFetcher : public net::URLFetcherDelegate {
|
| OAUTH1_LOGIN,
|
| OAUTH1_REQUEST_TOKEN,
|
| OAUTH1_ALL_ACCESS_TOKEN,
|
| + OAUTH2_LOGIN,
|
| OAUTH2_SERVICE_ACCESS_TOKEN,
|
| - USER_INFO,
|
| OAUTH2_REVOKE_TOKEN,
|
| + USER_INFO,
|
| } RequestType;
|
|
|
| GaiaOAuthFetcher(GaiaOAuthConsumer* consumer,
|
| @@ -68,10 +69,10 @@ class GaiaOAuthFetcher : public net::URLFetcherDelegate {
|
| void StartGetOAuthTokenRequest();
|
|
|
| // Performs account login based on OAuth1 access token and its secret.
|
| - void StartOAuthLogin(const char* source,
|
| - const char* service,
|
| - const std::string& oauth1_access_token,
|
| - const std::string& oauth1_access_token_secret);
|
| + void StartOAuth1Login(const char* source,
|
| + const char* service,
|
| + const std::string& oauth1_access_token,
|
| + const std::string& oauth1_access_token_secret);
|
|
|
| // Obtains an OAuth1 access token and secret
|
| //
|
|
|