Browser Plugin: New Implementation (Browser Side)

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 ac27895ee08215ea29dbfea498c1771beee607b6..8b611b5d1f6ee942df1de268973dc31501839c6c 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -13,6 +13,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/browser_plugin/old/old_browser_plugin_host.h"
 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
 #include "content/browser/renderer_host/render_view_host_delegate.h"
@@ -121,6 +122,10 @@ class CONTENT_EXPORT WebContentsImpl
   void RenderViewForInterstitialPageCreated(
       content::RenderViewHost* render_view_host);
 
+  // Finds the new RenderWidgetHost and returns it. Note that this can only be
+  // called once as this call also removes it from the internal map.
+  content::RenderWidgetHostView* GetCreatedWidget(int route_id);
+
   // Sets the passed passed interstitial as the currently showing interstitial.
   // |interstitial_page| should be non NULL (use the remove_interstitial_page
   // method to unset the interstitial) and no interstitial page should be set
@@ -146,6 +151,10 @@ class CONTENT_EXPORT WebContentsImpl
     return old_browser_plugin_host_.get();
   }
 
+  content::BrowserPluginHost* browser_plugin_host() const {
+    return browser_plugin_host_.get();
+  }
+
   // Like GetController from WebContents, but returns the concrete object.
   NavigationControllerImpl& GetControllerImpl();
 
@@ -595,10 +604,6 @@ class CONTENT_EXPORT WebContentsImpl
                          bool is_fullscreen,
                          const gfx::Rect& initial_pos);
 
-  // Finds the new RenderWidgetHost and returns it. Note that this can only be
-  // called once as this call also removes it from the internal map.
-  content::RenderWidgetHostView* GetCreatedWidget(int route_id);
-
   // Finds the new WebContentsImpl by route_id, initializes it for
   // renderer-initiated creation, and returns it. Note that this can only be
   // called once as this call also removes it from the internal map.
@@ -675,10 +680,13 @@ class CONTENT_EXPORT WebContentsImpl
       java_bridge_dispatcher_host_manager_;
 
   // TODO(fsamuel): Remove this once upstreaming of the new browser plugin
-  // implmentation is complete.
+  // implementation is complete.
   // Manages the browser plugin instances hosted by this WebContents.
   scoped_ptr<content::old::BrowserPluginHost> old_browser_plugin_host_;
 
+  // Manages the browser plugin instances hosted by this WebContents.
+  scoped_ptr<content::BrowserPluginHost> browser_plugin_host_;
+
   // SavePackage, lazily created.
   scoped_refptr<SavePackage> save_package_;