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

Unified Diff: chrome/browser/services/gcm/gcm_profile_service.cc

Issue 310973002: Move GCMClient related files to gcm_driver component (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Sync Created 6 years, 6 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
Index: chrome/browser/services/gcm/gcm_profile_service.cc
diff --git a/chrome/browser/services/gcm/gcm_profile_service.cc b/chrome/browser/services/gcm/gcm_profile_service.cc
index bb2d0c8cecdeebd7ef87e287f20c9680d3132a9a..424f5909fcc43c86e851b7da12966e20ade79f4f 100644
--- a/chrome/browser/services/gcm/gcm_profile_service.cc
+++ b/chrome/browser/services/gcm/gcm_profile_service.cc
@@ -42,15 +42,20 @@ void GCMProfileService::RegisterProfilePrefs(
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
}
+#if defined(OS_ANDROID)
+GCMProfileService::GCMProfileService(Profile* profile)
+ : profile_(profile) {
+ DCHECK(!profile->IsOffTheRecord());
+
+ driver_.reset(new GCMDriverAndroid);
+}
+#else
GCMProfileService::GCMProfileService(
Profile* profile,
scoped_ptr<GCMClientFactory> gcm_client_factory)
: profile_(profile) {
DCHECK(!profile->IsOffTheRecord());
-#if defined(OS_ANDROID)
- driver_.reset(new GCMDriverAndroid);
-#else
driver_ = CreateGCMDriverDesktop(
gcm_client_factory.Pass(),
scoped_ptr<IdentityProvider>(new ProfileIdentityProvider(
@@ -59,8 +64,8 @@ GCMProfileService::GCMProfileService(
LoginUIServiceFactory::GetForProfile(profile_))),
profile_->GetPath().Append(chrome::kGCMStoreDirname),
profile_->GetRequestContext());
-#endif
}
+#endif // defined(OS_ANDROID)
GCMProfileService::GCMProfileService() : profile_(NULL) {
}
« no previous file with comments | « chrome/browser/services/gcm/gcm_profile_service.h ('k') | chrome/browser/services/gcm/gcm_profile_service_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698