| 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 f3346123f4807576329b341276b251ec4d7f5638..fb02d398f86f8297e112115ff3a7abfec393303c 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -39,6 +39,7 @@
|
| #include "chrome/browser/net/chrome_net_log.h"
|
| #include "chrome/browser/notifications/desktop_notification_service.h"
|
| #include "chrome/browser/notifications/desktop_notification_service_factory.h"
|
| +#include "chrome/browser/pepper_gtalk_message_filter.h"
|
| #include "chrome/browser/platform_util.h"
|
| #include "chrome/browser/prefs/pref_service.h"
|
| #include "chrome/browser/prefs/scoped_user_pref_update.h"
|
| @@ -72,6 +73,7 @@
|
| #include "chrome/common/pref_names.h"
|
| #include "chrome/common/render_messages.h"
|
| #include "chrome/common/url_constants.h"
|
| +#include "content/public/browser/browser_child_process_host.h"
|
| #include "content/public/browser/browser_main_parts.h"
|
| #include "content/public/browser/browser_url_handler.h"
|
| #include "content/public/browser/child_process_security_policy.h"
|
| @@ -81,6 +83,7 @@
|
| #include "content/public/browser/site_instance.h"
|
| #include "content/public/browser/web_contents.h"
|
| #include "content/public/browser/web_contents_view.h"
|
| +#include "content/public/common/child_process_host.h"
|
| #include "grit/generated_resources.h"
|
| #include "grit/ui_resources.h"
|
| #include "net/base/ssl_cert_request_info.h"
|
| @@ -419,6 +422,11 @@ void ChromeContentBrowserClient::RenderProcessHostCreated(
|
| host->Send(new ChromeViewMsg_SetContentSettingRules(rules));
|
| }
|
|
|
| +void ChromeContentBrowserClient::BrowserChildProcessHostCreated(
|
| + content::BrowserChildProcessHost* host) {
|
| + host->GetHost()->AddFilter(new PepperGtalkMessageFilter());
|
| +}
|
| +
|
| content::WebUIControllerFactory*
|
| ChromeContentBrowserClient::GetWebUIControllerFactory() {
|
| return ChromeWebUIControllerFactory::GetInstance();
|
|
|