Chromium Code Reviews| Index: chrome/browser/android/signin/signin_manager_android.cc |
| diff --git a/chrome/browser/android/signin/signin_manager_android.cc b/chrome/browser/android/signin/signin_manager_android.cc |
| index 42184c0f0c2067362d6ee5c295ea6817c296bf02..94f82532fe6517e3381e222f3b606a5da1275ab4 100644 |
| --- a/chrome/browser/android/signin/signin_manager_android.cc |
| +++ b/chrome/browser/android/signin/signin_manager_android.cc |
| @@ -22,7 +22,7 @@ |
| #include "chrome/browser/browsing_data/browsing_data_remover.h" |
| #include "chrome/browser/profiles/profile_manager.h" |
| #include "chrome/browser/signin/account_tracker_service_factory.h" |
| -#include "chrome/browser/signin/android_profile_oauth2_token_service.h" |
| +#include "chrome/browser/signin/oauth2_token_service_delegate_android.h" |
| #include "chrome/browser/signin/profile_oauth2_token_service_factory.h" |
| #include "chrome/browser/signin/signin_manager_factory.h" |
| #include "chrome/common/pref_names.h" |
| @@ -265,13 +265,14 @@ void SigninManagerAndroid::ClearLastSignedInUser() { |
| void SigninManagerAndroid::LogInSignedInUser(JNIEnv* env, jobject obj) { |
| SigninManagerBase* signin_manager = |
| SigninManagerFactory::GetForProfile(profile_); |
| - // Just fire the events and let the Account Reconcilor handles everything. |
| - AndroidProfileOAuth2TokenService* token_service = |
| - ProfileOAuth2TokenServiceFactory::GetPlatformSpecificForProfile( |
| - profile_); |
| - const std::string& primary_acct = |
| - signin_manager->GetAuthenticatedAccountId(); |
| - token_service->ValidateAccounts(primary_acct, true); |
| + // New Mirror code path that just fires the events and let the |
|
nyquist
2015/07/02 18:33:08
I thought usages of code names were discouraged? C
|
| + // Account Reconcilor handles everything. |
| + ProfileOAuth2TokenService* token_service = |
| + ProfileOAuth2TokenServiceFactory::GetForProfile(profile_); |
| + const std::string& primary_acct = signin_manager->GetAuthenticatedAccountId(); |
| + |
| + static_cast<OAuth2TokenServiceDelegateAndroid*>(token_service->GetDelegate()) |
| + ->ValidateAccounts(primary_acct, true); |
| } |
| jboolean SigninManagerAndroid::IsSigninAllowedByPolicy(JNIEnv* env, |