Browser Plugin: Removed BrowserPluginWebContentsObserver (to be replaced by rewritten BrowserPlugi…

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 934ad7a50463b22c8b8c717ebe9aae80efcf21e2..ad60e7b4d32eb469f26f6ef203bf4acb2ebcb543 100644
--- a/content/browser/web_contents/web_contents_impl.h
+++ b/content/browser/web_contents/web_contents_impl.h
@@ -14,7 +14,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/property_bag.h"
-#include "content/browser/browser_plugin/browser_plugin_web_contents_observer.h"
 #include "content/browser/renderer_host/java/java_bridge_dispatcher_host_manager.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/browser/web_contents/render_view_host_manager.h"
@@ -124,11 +123,6 @@ class CONTENT_EXPORT WebContentsImpl
     return java_bridge_dispatcher_host_manager_.get();
   }
 
-  content::BrowserPluginWebContentsObserver*
-      browser_plugin_web_contents_observer() const {
-    return browser_plugin_web_contents_observer_.get();
-  }
-
   // Like GetController from WebContents, but returns the concrete object.
   NavigationControllerImpl& GetControllerImpl();
 
@@ -146,7 +140,10 @@ class CONTENT_EXPORT WebContentsImpl
   virtual void SetViewType(content::ViewType type) OVERRIDE;
   virtual content::ViewType GetViewType() const OVERRIDE;
   virtual content::RenderProcessHost* GetRenderProcessHost() const OVERRIDE;
+  virtual content::RenderProcessHost*
+      GetPendingRenderProcessHost() const OVERRIDE;

[Charlie Reis, 2012/05/11 17:41:03]

This is already accessible via the RenderViewHost.  We should not expose it
here.

[Fady Samuel, 2012/05/11 22:03:34]

Done.

   virtual content::RenderViewHost* GetRenderViewHost() const OVERRIDE;
+  virtual content::RenderViewHost* GetPendingRenderViewHost() const OVERRIDE;

[Charlie Reis, 2012/05/11 17:41:03]

I'm hesitant to expose this outside of WebContentsImpl, and certainly outside of
the content module.  It exposes a great deal of complexity that has been best to
keep inside WebContentsImpl so far.

I could be convinced if there's sufficient cause, but we may also want to think
if there's a better way to achieve the same goal.

[Fady Samuel, 2012/05/11 22:03:34]

This doesn't really need to be exposed outside the content module. We need it in
WebContentsImpl though because BrowserPluginHost needs to direct messages to the
new render process to tell it to begin compositing.

[Charlie Reis, 2012/05/11 22:16:47]

Would it be possible to put a method on WebContentsImpl to accomplish this for
you, rather than exposing the pending RVH outside of WebContentsImpl (even
within the content module)?

   virtual content::RenderWidgetHostView*
       GetRenderWidgetHostView() const OVERRIDE;
   virtual content::WebContentsView* GetView() const OVERRIDE;
@@ -588,8 +585,6 @@ class CONTENT_EXPORT WebContentsImpl
   scoped_ptr<JavaBridgeDispatcherHostManager>
       java_bridge_dispatcher_host_manager_;
 
-  scoped_ptr<content::BrowserPluginWebContentsObserver>
-      browser_plugin_web_contents_observer_;
   // SavePackage, lazily created.
   scoped_refptr<SavePackage> save_package_;