Index: chrome/renderer/chrome_content_renderer_client.cc |
diff --git a/chrome/renderer/chrome_content_renderer_client.cc b/chrome/renderer/chrome_content_renderer_client.cc |
index 493052fc47bfcacdca587dccac2ae92b6f96c781..dc3219697f11ee4dc9c6d6653b9ae66932bc76b8 100644 |
--- a/chrome/renderer/chrome_content_renderer_client.cc |
+++ b/chrome/renderer/chrome_content_renderer_client.cc |
@@ -29,6 +29,7 @@ |
#include "chrome/grit/renderer_resources.h" |
#include "chrome/renderer/banners/app_banner_client.h" |
#include "chrome/renderer/benchmarking_extension.h" |
+#include "chrome/renderer/chrome_guest_view_container_observer.h" |
#include "chrome/renderer/chrome_render_frame_observer.h" |
#include "chrome/renderer/chrome_render_process_observer.h" |
#include "chrome/renderer/chrome_render_view_observer.h" |
@@ -61,7 +62,6 @@ |
#include "components/content_settings/core/common/content_settings_pattern.h" |
#include "components/data_reduction_proxy/core/common/data_reduction_proxy_headers.h" |
#include "components/dom_distiller/core/url_constants.h" |
-#include "components/guest_view/renderer/guest_view_container.h" |
#include "components/nacl/renderer/ppb_nacl_private.h" |
#include "components/nacl/renderer/ppb_nacl_private_impl.h" |
#include "components/network_hints/renderer/prescient_networking_dispatcher.h" |
@@ -366,6 +366,7 @@ void ChromeContentRendererClient::RenderThreadStarted() { |
chrome_observer_.reset(new ChromeRenderProcessObserver()); |
web_cache_observer_.reset(new web_cache::WebCacheRenderProcessObserver()); |
+ guest_view_container_observer_.reset(new ChromeGuestViewContainerObserver()); |
#if defined(ENABLE_EXTENSIONS) |
extension_dispatcher_delegate_.reset( |
@@ -404,6 +405,7 @@ void ChromeContentRendererClient::RenderThreadStarted() { |
thread->AddObserver(chrome_observer_.get()); |
thread->AddObserver(web_cache_observer_.get()); |
+ thread->AddObserver(guest_view_container_observer_.get()); |
#if defined(ENABLE_EXTENSIONS) |
thread->AddObserver(extension_dispatcher_.get()); |
#endif |
@@ -1312,17 +1314,6 @@ bool ChromeContentRendererClient::ShouldFork(blink::WebFrame* frame, |
return false; |
} |
-bool ChromeContentRendererClient::ShouldForwardToGuestContainer( |
- const IPC::Message& msg) { |
- if (IPC_MESSAGE_CLASS(msg) == GuestViewMsgStart) |
- return true; |
-#if defined(ENABLE_EXTENSIONS) |
- return IPC_MESSAGE_CLASS(msg) == ExtensionsGuestViewMsgStart; |
-#else |
- return false; |
-#endif |
-} |
- |
bool ChromeContentRendererClient::WillSendRequest( |
blink::WebFrame* frame, |
ui::PageTransition transition_type, |