Move guest view container message routing out of content/.

extensions/shell/renderer/shell_content_renderer_client.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "extensions/shell/renderer/shell_content_renderer_client.h"
 
-#include "components/guest_view/renderer/guest_view_container.h"
 #include "content/public/common/content_constants.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_frame_observer.h"
 #include "content/public/renderer/render_frame_observer_tracker.h"
 #include "content/public/renderer/render_thread.h"
 #include "extensions/common/extensions_client.h"
 #include "extensions/renderer/dispatcher.h"
 #include "extensions/renderer/dispatcher_delegate.h"
 #include "extensions/renderer/extension_frame_helper.h"
 #include "extensions/renderer/extension_helper.h"
 #include "extensions/renderer/guest_view/extensions_guest_view_container.h"
+#include "extensions/renderer/guest_view/extensions_guest_view_container_dispatcher.h"
 #include "extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container.h"
 #include "extensions/shell/common/shell_extensions_client.h"
 #include "extensions/shell/renderer/shell_extensions_renderer_client.h"
-#include "ipc/ipc_message_macros.h"
 #include "third_party/WebKit/public/web/WebLocalFrame.h"
 
 #if !defined(DISABLE_NACL)
 #include "components/nacl/common/nacl_constants.h"
 #include "components/nacl/renderer/nacl_helper.h"
 #include "components/nacl/renderer/ppb_nacl_private.h"
 #include "components/nacl/renderer/ppb_nacl_private_impl.h"
 #endif
 
 using blink::WebFrame;
@@ skipping 17 matching lines @@
   extensions_renderer_client_.reset(new ShellExtensionsRendererClient);
   ExtensionsRendererClient::Set(extensions_renderer_client_.get());
 
   extension_dispatcher_delegate_.reset(new DispatcherDelegate());
 
   // Must be initialized after ExtensionsRendererClient.
   extension_dispatcher_.reset(
       new Dispatcher(extension_dispatcher_delegate_.get()));
   thread->AddObserver(extension_dispatcher_.get());
 
+  guest_view_container_dispatcher_.reset(
+      new ExtensionsGuestViewContainerDispatcher());
+  thread->AddObserver(guest_view_container_dispatcher_.get());
+
   // TODO(jamescook): Init WebSecurityPolicy for chrome-extension: schemes.
   // See ChromeContentRendererClient for details.
 }
 
 void ShellContentRendererClient::RenderFrameCreated(
     content::RenderFrame* render_frame) {
   // ExtensionFrameHelper destroys itself when the RenderFrame is destroyed.
   new ExtensionFrameHelper(render_frame, extension_dispatcher_.get());
 
   // TODO(jamescook): Do we need to add a new PepperHelper(render_frame) here?
@@ skipping 19 matching lines @@
   return false;
 }
 
 blink::WebPlugin* ShellContentRendererClient::CreatePluginReplacement(
     content::RenderFrame* render_frame,
     const base::FilePath& plugin_path) {
   // Don't provide a custom "failed to load" plugin.
   return NULL;
 }
 
-bool ShellContentRendererClient::ShouldForwardToGuestContainer(
-    const IPC::Message& msg) {
-  return (IPC_MESSAGE_CLASS(msg) == GuestViewMsgStart) ||
-      (IPC_MESSAGE_CLASS(msg) == ExtensionsGuestViewMsgStart);
-}
-
 bool ShellContentRendererClient::WillSendRequest(
     blink::WebFrame* frame,
     ui::PageTransition transition_type,
     const GURL& url,
     const GURL& first_party_for_cookies,
     GURL* new_url) {
   // TODO(jamescook): Cause an error for bad extension scheme requests?
   return false;
 }
 
@@ skipping 34 matching lines @@
     return new extensions::MimeHandlerViewContainer(
         render_frame, mime_type, original_url);
   }
 }
 
 ExtensionsClient* ShellContentRendererClient::CreateExtensionsClient() {
   return new ShellExtensionsClient;
 }
 
 }  // namespace extensions