Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2274)

Unified Diff: chrome/browser/signin/profile_identity_provider.cc

Issue 225403021: Extract Profile-independent GCMService from GCMProfileService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Restore real IO thread in unit tests. Remove sources of flakiness by waiting instead of pumping whe… Created 6 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/services/gcm/gcm_service_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/signin/profile_identity_provider.cc
diff --git a/chrome/browser/signin/profile_identity_provider.cc b/chrome/browser/signin/profile_identity_provider.cc
index 7ae1a4699c0d2a1d7d0d787808fd19963a1696e6..2a9299353b7b976c42d9211495f150aec0030eff 100644
--- a/chrome/browser/signin/profile_identity_provider.cc
+++ b/chrome/browser/signin/profile_identity_provider.cc
@@ -4,9 +4,12 @@
#include "chrome/browser/signin/profile_identity_provider.h"
-#include "chrome/browser/ui/webui/signin/login_ui_service.h"
#include "components/signin/core/browser/profile_oauth2_token_service.h"
+#if !defined(OS_ANDROID)
+#include "chrome/browser/ui/webui/signin/login_ui_service.h"
+#endif
+
ProfileIdentityProvider::ProfileIdentityProvider(
SigninManagerBase* signin_manager,
ProfileOAuth2TokenService* token_service,
@@ -34,8 +37,12 @@ OAuth2TokenService* ProfileIdentityProvider::GetTokenService() {
}
bool ProfileIdentityProvider::RequestLogin() {
+#if defined(OS_ANDROID)
+ return false;
+#else
login_ui_service_->ShowLoginPopup();
return true;
+#endif
}
void ProfileIdentityProvider::GoogleSigninSucceeded(
« no previous file with comments | « chrome/browser/services/gcm/gcm_service_unittest.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698