diff options
Diffstat (limited to 'chrome/browser/services')
-rw-r--r-- | chrome/browser/services/gcm/gcm_desktop_utils.cc | 2 | ||||
-rw-r--r-- | chrome/browser/services/gcm/gcm_desktop_utils.h | 2 | ||||
-rw-r--r-- | chrome/browser/services/gcm/gcm_profile_service.cc | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/chrome/browser/services/gcm/gcm_desktop_utils.cc b/chrome/browser/services/gcm/gcm_desktop_utils.cc index 7e81c8d..9de629b 100644 --- a/chrome/browser/services/gcm/gcm_desktop_utils.cc +++ b/chrome/browser/services/gcm/gcm_desktop_utils.cc @@ -73,6 +73,7 @@ GCMClient::ChromeBuildInfo GetChromeBuildInfo() { scoped_ptr<GCMDriver> CreateGCMDriverDesktop( scoped_ptr<GCMClientFactory> gcm_client_factory, + PrefService* prefs, const base::FilePath& store_path, const scoped_refptr<net::URLRequestContextGetter>& request_context) { scoped_refptr<base::SequencedWorkerPool> worker_pool( @@ -84,6 +85,7 @@ scoped_ptr<GCMDriver> CreateGCMDriverDesktop( return scoped_ptr<GCMDriver>(new GCMDriverDesktop( gcm_client_factory.Pass(), GetChromeBuildInfo(), + prefs, store_path, request_context, content::BrowserThread::GetMessageLoopProxyForThread( diff --git a/chrome/browser/services/gcm/gcm_desktop_utils.h b/chrome/browser/services/gcm/gcm_desktop_utils.h index c882005..8105829 100644 --- a/chrome/browser/services/gcm/gcm_desktop_utils.h +++ b/chrome/browser/services/gcm/gcm_desktop_utils.h @@ -8,6 +8,7 @@ #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" +class PrefService; namespace base { class FilePath; } @@ -23,6 +24,7 @@ class GCMClientFactory; scoped_ptr<GCMDriver> CreateGCMDriverDesktop( scoped_ptr<GCMClientFactory> gcm_client_factory, + PrefService* prefs, const base::FilePath& store_path, const scoped_refptr<net::URLRequestContextGetter>& request_context); diff --git a/chrome/browser/services/gcm/gcm_profile_service.cc b/chrome/browser/services/gcm/gcm_profile_service.cc index 5324ffd..75e1bdd 100644 --- a/chrome/browser/services/gcm/gcm_profile_service.cc +++ b/chrome/browser/services/gcm/gcm_profile_service.cc @@ -169,6 +169,7 @@ GCMProfileService::GCMProfileService( driver_ = CreateGCMDriverDesktop( gcm_client_factory.Pass(), + profile_->GetPrefs(), profile_->GetPath().Append(chrome::kGCMStoreDirname), profile_->GetRequestContext()); |