diff options
| author | Ben Murdoch <benm@google.com> | 2014-03-31 11:51:25 +0100 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2014-03-31 11:51:25 +0100 |
| commit | effb81e5f8246d0db0270817048dc992db66e9fb (patch) | |
| tree | cc45ced7dfde038c8f3d022ee1eeac207a68761e /chrome/browser/signin/android_profile_oauth2_token_service.h | |
| parent | 4d26337013537c1acafbcb63b9b2b7e404c3adc9 (diff) | |
| download | chromium_org-effb81e5f8246d0db0270817048dc992db66e9fb.tar.gz | |
Merge from Chromium at DEPS revision 260458
This commit was generated by merge_to_master.py.
Change-Id: I140fa91b7f09c8efba4424e99ccb87b94a11d022
Diffstat (limited to 'chrome/browser/signin/android_profile_oauth2_token_service.h')
| -rw-r--r-- | chrome/browser/signin/android_profile_oauth2_token_service.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/signin/android_profile_oauth2_token_service.h b/chrome/browser/signin/android_profile_oauth2_token_service.h index 98b0533d18..7d6a660299 100644 --- a/chrome/browser/signin/android_profile_oauth2_token_service.h +++ b/chrome/browser/signin/android_profile_oauth2_token_service.h @@ -12,7 +12,7 @@ #include "base/callback.h" #include "base/memory/scoped_ptr.h" #include "base/time/time.h" -#include "components/signin/core/profile_oauth2_token_service.h" +#include "components/signin/core/browser/profile_oauth2_token_service.h" #include "google_apis/gaia/google_service_auth_error.h" // A specialization of ProfileOAuth2TokenService that will be returned by @@ -68,7 +68,7 @@ class AndroidProfileOAuth2TokenService : public ProfileOAuth2TokenService { virtual void FireRefreshTokensLoadedFromJava(JNIEnv* env, jobject obj); protected: - friend class ProfileOAuth2TokenServiceWrapperImpl; + friend class ProfileOAuth2TokenServiceFactory; AndroidProfileOAuth2TokenService(); virtual ~AndroidProfileOAuth2TokenService(); |