Browser Plugin: browser process side changes

content/browser/web_contents/web_contents_impl.h

Index: content/browser/web_contents/web_contents_impl.h
diff --git a/content/browser/web_contents/web_contents_impl.h b/content/browser/web_contents/web_contents_impl.h
index 362c96e093ebe86b708e858cc7c8af5c34de3d9e..4f292ead0ff42a74465eaf3a5dc3636570535be4 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -14,6 +14,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/property_bag.h"
+#include "content/browser/browser_plugin/browser_plugin_host.h"
 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
@@ -133,6 +134,10 @@ class CONTENT_EXPORT WebContentsImpl
     return java_bridge_dispatcher_host_manager_.get();
   }
 
+  content::BrowserPluginHost* browser_plugin_host() const {
+    return browser_plugin_host_.get();
+  }
+
   // Like GetController from WebContents, but returns the concrete object.
   NavigationControllerImpl& GetControllerImpl();
 
@@ -359,6 +364,15 @@ class CONTENT_EXPORT WebContentsImpl
   virtual void ResizeDueToAutoResize(const gfx::Size& new_size) OVERRIDE;
   virtual void RequestToLockMouse(bool user_gesture) OVERRIDE;
   virtual void LostMouseLock() OVERRIDE;
+  virtual void ConnectEmbedderToChannel(
+      content::RenderViewHost* render_view_host,
+      const IPC::ChannelHandle& channel_handle) OVERRIDE;
+  virtual void NavigateGuestFromEmbedder(
+      content::RenderViewHost* render_view_host,
+      int container_instance_id,
+      long long frame_id,
+      const std::string& src,
+      const gfx::Size& size) OVERRIDE;
 
   // RenderWidgetHostDelegate --------------------------------------------------
 
@@ -608,6 +622,9 @@ class CONTENT_EXPORT WebContentsImpl
   scoped_ptr<JavaBridgeDispatcherHostManager>
       java_bridge_dispatcher_host_manager_;
 
+  // Manages the browser plugin instances hosted by this WebContents.
+  scoped_ptr<content::BrowserPluginHost> browser_plugin_host_;
+
   // SavePackage, lazily created.
   scoped_refptr<SavePackage> save_package_;