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

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: Rebase. Address 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
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/services/gcm/push_messaging_service_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 e431d8dcb56063034908d189293b21ce40727e17..3e549a75d447f53b07669601e2cbc5037c61dbd1 100644
--- a/chrome/browser/services/gcm/gcm_profile_service.cc
+++ b/chrome/browser/services/gcm/gcm_profile_service.cc
@@ -98,12 +98,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);
@@ -113,7 +114,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(
@@ -127,7 +128,7 @@ GCMProfileService::GCMProfileService(
GCMProfileService::GCMProfileService()
: profile_(NULL),
- push_messaging_service_(this) {
+ push_messaging_service_(this, NULL) {
}
GCMProfileService::~GCMProfileService() {
« no previous file with comments | « chrome/browser/profiles/profile_impl.cc ('k') | chrome/browser/services/gcm/push_messaging_service_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698