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

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

Issue 317823007: Hook PushMessagingMessageFilter up to GCMDriver (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Send failure IPC when service is NULL 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 424f5909fcc43c86e851b7da12966e20ade79f4f..d4ab7028ab9c9d37dcb7bd9edae2f13c0fb56062 100644
--- a/chrome/browser/services/gcm/gcm_profile_service.cc
+++ b/chrome/browser/services/gcm/gcm_profile_service.cc
@@ -44,7 +44,8 @@ void GCMProfileService::RegisterProfilePrefs(
#if defined(OS_ANDROID)
GCMProfileService::GCMProfileService(Profile* profile)
- : profile_(profile) {
+ : profile_(profile),
+ push_messaging_service_(this) {
DCHECK(!profile->IsOffTheRecord());
driver_.reset(new GCMDriverAndroid);
@@ -53,7 +54,8 @@ GCMProfileService::GCMProfileService(Profile* profile)
GCMProfileService::GCMProfileService(
Profile* profile,
scoped_ptr<GCMClientFactory> gcm_client_factory)
- : profile_(profile) {
+ : profile_(profile),
+ push_messaging_service_(this) {
DCHECK(!profile->IsOffTheRecord());
driver_ = CreateGCMDriverDesktop(
@@ -67,7 +69,9 @@ GCMProfileService::GCMProfileService(
}
#endif // defined(OS_ANDROID)
-GCMProfileService::GCMProfileService() : profile_(NULL) {
+GCMProfileService::GCMProfileService()
+ : profile_(NULL),
+ push_messaging_service_(this) {
}
GCMProfileService::~GCMProfileService() {
« no previous file with comments | « chrome/browser/services/gcm/gcm_profile_service.h ('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