| 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 6c986f475035ee85fb7e6c8047211fd175392020..cc9cbf63b176660b18e801d273d0cf69e0a16b87 100644
|
| --- a/chrome/browser/chrome_content_browser_client.cc
|
| +++ b/chrome/browser/chrome_content_browser_client.cc
|
| @@ -56,6 +56,7 @@
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/browser/renderer_host/chrome_render_message_filter.h"
|
| #include "chrome/browser/renderer_host/chrome_render_view_host_observer.h"
|
| +#include "chrome/browser/renderer_host/pepper/chrome_browser_pepper_host_factory.h"
|
| #include "chrome/browser/renderer_host/plugin_info_message_filter.h"
|
| #include "chrome/browser/search_engines/search_provider_install_state_message_filter.h"
|
| #include "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
|
| @@ -83,6 +84,7 @@
|
| #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_ppapi_host.h"
|
| #include "content/public/browser/browser_url_handler.h"
|
| #include "content/public/browser/child_process_security_policy.h"
|
| #include "content/public/browser/render_process_host.h"
|
| @@ -99,6 +101,7 @@
|
| #include "net/base/ssl_cert_request_info.h"
|
| #include "net/cookies/canonical_cookie.h"
|
| #include "net/cookies/cookie_options.h"
|
| +#include "ppapi/host/ppapi_host.h"
|
| #include "ui/base/l10n/l10n_util.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
| #include "webkit/glue/webpreferences.h"
|
| @@ -1591,6 +1594,13 @@ std::string ChromeContentBrowserClient::GetDefaultDownloadName() {
|
| return l10n_util::GetStringUTF8(IDS_DEFAULT_DOWNLOAD_FILENAME);
|
| }
|
|
|
| +void ChromeContentBrowserClient::DidCreatePpapiPlugin(
|
| + content::BrowserPpapiHost* browser_host) {
|
| + browser_host->GetPpapiHost()->AddHostFactoryFilter(
|
| + scoped_ptr<ppapi::host::HostFactory>(
|
| + new ChromeBrowserPepperHostFactory(browser_host)));
|
| +}
|
| +
|
| bool ChromeContentBrowserClient::AllowPepperSocketAPI(
|
| content::BrowserContext* browser_context, const GURL& url) {
|
| if (!url.is_valid())
|
|
|