| Index: chrome/browser/signin/android_profile_oauth2_token_service.h
|
| diff --git a/chrome/browser/signin/android_profile_oauth2_token_service.h b/chrome/browser/signin/android_profile_oauth2_token_service.h
|
| index 7d6a66029992f14806215f627225c64796c112c0..44cf5b947a14772040a7416757766be8cead1def 100644
|
| --- a/chrome/browser/signin/android_profile_oauth2_token_service.h
|
| +++ b/chrome/browser/signin/android_profile_oauth2_token_service.h
|
| @@ -42,15 +42,15 @@ class AndroidProfileOAuth2TokenService : public ProfileOAuth2TokenService {
|
| // Lists account IDs of all accounts with a refresh token.
|
| virtual std::vector<std::string> GetAccounts() OVERRIDE;
|
|
|
| - void ValidateAccounts(JNIEnv* env,
|
| + bool ValidateAccounts(JNIEnv* env,
|
| jobject obj,
|
| - jobjectArray accounts,
|
| + jobjectArray prev_account_ids,
|
| jstring current_account);
|
|
|
| // Takes a the signed in sync account as well as all the other
|
| // android account ids and check the token status of each.
|
| - void ValidateAccounts(const std::string& signed_in_account,
|
| - const std::vector<std::string>& account_ids);
|
| + bool ValidateAccounts(const std::string& signed_in_account,
|
| + const std::vector<std::string>& prev_account_ids);
|
|
|
| // Triggers a notification to all observers of the OAuth2TokenService that a
|
| // refresh token is now available. This may cause observers to retry
|
| @@ -67,6 +67,10 @@ class AndroidProfileOAuth2TokenService : public ProfileOAuth2TokenService {
|
| // refresh tokens have now been loaded.
|
| virtual void FireRefreshTokensLoadedFromJava(JNIEnv* env, jobject obj);
|
|
|
| + // Overridden from OAuth2TokenService to complete signout of all
|
| + // OA2TService aware accounts.
|
| + virtual void RevokeAllCredentials() OVERRIDE;
|
| +
|
| protected:
|
| friend class ProfileOAuth2TokenServiceFactory;
|
| AndroidProfileOAuth2TokenService();
|
|
|