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

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

Issue 338363003: Push API: register PushMessagingServiceImpl as GCMAppHandler. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add as AppHandler before calling Register. Other review issues. 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 d4ab7028ab9c9d37dcb7bd9edae2f13c0fb56062..c36391ec68318352c5b304844741444c7604d0f5 100644
--- a/chrome/browser/services/gcm/gcm_profile_service.cc
+++ b/chrome/browser/services/gcm/gcm_profile_service.cc
@@ -40,12 +40,13 @@ void GCMProfileService::RegisterProfilePrefs(
prefs::kGCMChannelEnabled,
true,
user_prefs::PrefRegistrySyncable::UNSYNCABLE_PREF);
+ PushMessagingServiceImpl::RegisterProfilePrefs(registry);
}
#if defined(OS_ANDROID)
GCMProfileService::GCMProfileService(Profile* profile)
: profile_(profile),
- push_messaging_service_(this) {
+ push_messaging_service_(this, profile) {
DCHECK(!profile->IsOffTheRecord());
driver_.reset(new GCMDriverAndroid);
@@ -55,7 +56,7 @@ GCMProfileService::GCMProfileService(
Profile* profile,
scoped_ptr<GCMClientFactory> gcm_client_factory)
: profile_(profile),
- push_messaging_service_(this) {
+ push_messaging_service_(this, profile) {
DCHECK(!profile->IsOffTheRecord());
driver_ = CreateGCMDriverDesktop(
@@ -71,7 +72,7 @@ GCMProfileService::GCMProfileService(
GCMProfileService::GCMProfileService()
: profile_(NULL),
- push_messaging_service_(this) {
+ push_messaging_service_(this, NULL) {
}
GCMProfileService::~GCMProfileService() {

Powered by Google App Engine
This is Rietveld 408576698