| Index: chrome/browser/chrome_content_browser_client.cc
|
| diff --git a/chrome/browser/chrome_content_browser_client.cc b/chrome/browser/chrome_content_browser_client.cc
|
| index 0c8f73371a16eb251f6c77c5b9605fa8b99053f1..40de7bd41c8c1758db182283d915a4826979c6c6 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -72,6 +72,8 @@
|
| #include "chrome/browser/search/instant_service_factory.h"
|
| #include "chrome/browser/search/search.h"
|
| #include "chrome/browser/search_engines/search_provider_install_state_message_filter.h"
|
| +#include "chrome/browser/services/gcm/gcm_profile_service.h"
|
| +#include "chrome/browser/services/gcm/gcm_profile_service_factory.h"
|
| #include "chrome/browser/signin/principals_message_filter.h"
|
| #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
|
| #include "chrome/browser/speech/tts_message_filter.h"
|
| @@ -117,6 +119,7 @@
|
| #include "content/public/browser/browser_url_handler.h"
|
| #include "content/public/browser/child_process_data.h"
|
| #include "content/public/browser/child_process_security_policy.h"
|
| +#include "content/public/browser/push_messaging_service.h"
|
| #include "content/public/browser/render_frame_host.h"
|
| #include "content/public/browser/render_process_host.h"
|
| #include "content/public/browser/render_view_host.h"
|
| @@ -2247,6 +2250,13 @@ content::SpeechRecognitionManagerDelegate*
|
| return new speech::ChromeSpeechRecognitionManagerDelegate();
|
| }
|
|
|
| +content::PushMessagingService*
|
| +ChromeContentBrowserClient::CreatePushMessagingService(
|
| + content::BrowserContext* browser_context) {
|
| + return gcm::GCMProfileServiceFactory::GetForProfile(
|
| + Profile::FromBrowserContext(browser_context))->push_messaging_service();
|
| +}
|
| +
|
| net::NetLog* ChromeContentBrowserClient::GetNetLog() {
|
| return g_browser_process->net_log();
|
| }
|
|
|