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..70d19c483cac53a4631fe86cf84ad4d2d323aac0 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -39,6 +39,8 @@ class WebContentsImpl;
 struct ViewMsg_PostMessage_Params;
 
 namespace content {
+class BrowserPluginEmbedder;
+class BrowserPluginGuest;
 class ColorChooser;
 class DownloadItem;
 class JavaScriptDialogCreator;
@@ -152,6 +154,15 @@ class CONTENT_EXPORT WebContentsImpl
   // Expose the render manager for testing.
   RenderViewHostManager* GetRenderManagerForTesting();
 
+  // Sets guest to this WebContents embedder.
+  content::BrowserPluginGuest* SetBrowserPluginGuest(int instance_id);
+  // Returns guest browser plugin object, NULL if this WebContents is not a

[Charlie Reis, 2012/08/29 00:11:04]

nit: or NULL (same below)

[lazyboy, 2012/08/29 21:24:44]

Done.

+  // guest.
+  content::BrowserPluginGuest* GetBrowserPluginGuest();
+  // Returns embedder browser plugin object, NULL if this WebContents is not an
+  // embedder.
+  content::BrowserPluginEmbedder* GetBrowserPluginEmbedder();
+
   // content::WebContents ------------------------------------------------------
   virtual const base::PropertyBag* GetPropertyBag() const OVERRIDE;
   virtual base::PropertyBag* GetPropertyBag() OVERRIDE;
@@ -519,6 +530,10 @@ class CONTENT_EXPORT WebContentsImpl
   void OnWebUISend(const GURL& source_url,
                    const std::string& name,
                    const base::ListValue& args);
+  void OnBrowserPluginNavigateGuest(int instance_id,
+                                    int64 frame_id,
+                                    std::string src,
+                                    gfx::Size size);
 
   // Changes the IsLoading state and notifies delegate as needed
   // |details| is used to provide details on the load that just finished
@@ -675,7 +690,7 @@ 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_;
 
@@ -794,6 +809,13 @@ class CONTENT_EXPORT WebContentsImpl
   // Color chooser that was opened by this tab.
   content::ColorChooser* color_chooser_;
 
+  // Manages the embedder state for browser plugins, if this WebContents is an
+  // embedder, NULL otherwise.

[Charlie Reis, 2012/08/29 00:11:04]

nit: semicolon (here and below).

[lazyboy, 2012/08/29 21:24:44]

Done.

+  scoped_ptr<content::BrowserPluginEmbedder> browser_plugin_embedder_;
+  // Manages the guest state for browser plugin, if this WebContents is a guest,
+  // NULL otherwise.
+  scoped_ptr<content::BrowserPluginGuest> browser_plugin_guest_;
+
   // This must be at the end, or else we might get notifications and use other
   // member variables that are gone.
   content::NotificationRegistrar registrar_;