Browser Plugin: New Implementation (Browser Side)

content/browser/web_contents/web_contents_impl.h

 // Copyright (c) 2012 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.
 
 #ifndef CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 #define CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_
 
 #include <map>
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "base/gtest_prod_util.h"
 #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"
 #include "content/browser/renderer_host/render_widget_host_delegate.h"
 #include "content/browser/web_contents/navigation_controller_impl.h"
 #include "content/browser/web_contents/render_view_host_manager.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents.h"
@@ skipping 88 matching lines @@
   //
   // If this method returns false, then the navigation is discarded (equivalent
   // to calling DiscardPendingEntry on the NavigationController).
   bool NavigateToPendingEntry(
       content::NavigationController::ReloadType reload_type);
 
   // Called by InterstitialPageImpl when it creates a RenderViewHost.
   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);

[Charlie Reis, 2012/08/13 17:50:14]

As discussed in the other review, we probably don't want to make this public.

+
   // 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
   // when there is already a non NULL interstitial page set.
   void set_interstitial_page(InterstitialPageImpl* interstitial_page) {
     render_manager_.set_interstitial_page(interstitial_page);
   }
 
   // Unsets the currently showing interstitial.
   void remove_interstitial_page() {
     render_manager_.remove_interstitial_page();
   }
 
   void set_opener_web_ui_type(content::WebUI::TypeID opener_web_ui_type) {
     opener_web_ui_type_ = opener_web_ui_type;
   }
 
   JavaBridgeDispatcherHostManager* java_bridge_dispatcher_host_manager() const {
     return java_bridge_dispatcher_host_manager_.get();
   }
 
   content::old::BrowserPluginHost* old_browser_plugin_host() const {
     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();
 
   // Expose the render manager for testing.
   RenderViewHostManager* GetRenderManagerForTesting();
 
   // content::WebContents ------------------------------------------------------
   virtual const base::PropertyBag* GetPropertyBag() const OVERRIDE;
   virtual base::PropertyBag* GetPropertyBag() OVERRIDE;
   virtual content::WebContentsDelegate* GetDelegate() OVERRIDE;
@@ skipping 429 matching lines @@
   // Helper for CreateNewWidget/CreateNewFullscreenWidget.
   void CreateNewWidget(int route_id,
                        bool is_fullscreen,
                        WebKit::WebPopupType popup_type);
 
   // Helper for ShowCreatedWidget/ShowCreatedFullscreenWidget.
   void ShowCreatedWidget(int route_id,
                          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.
   WebContentsImpl* GetCreatedWindow(int route_id);
 
   // Misc non-view stuff -------------------------------------------------------
 
   // Helper functions for sending notifications.
   void NotifySwapped();
   void NotifyConnected();
@@ skipping 56 matching lines @@
 
   // Manages creation and swapping of render views.
   RenderViewHostManager render_manager_;
 
   // Manages injecting Java objects into all RenderViewHosts associated with
   // this WebContentsImpl.
   scoped_ptr<JavaBridgeDispatcherHostManager>
       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.

[Charlie Reis, 2012/08/13 17:50:14]

Again, this isn't clear about the embedder vs guest roles.

+  scoped_ptr<content::BrowserPluginHost> browser_plugin_host_;
+
   // SavePackage, lazily created.
   scoped_refptr<SavePackage> save_package_;
 
   // Data for loading state ----------------------------------------------------
 
   // Indicates whether we're currently loading a resource.
   bool is_loading_;
 
   // Indicates if the tab is considered crashed.
   base::TerminationStatus crashed_status_;
@@ skipping 107 matching lines @@
   content::NotificationRegistrar registrar_;
 
   // Used during IPC message dispatching so that the handlers can get a pointer
   // to the RVH through which the message was received.
   content::RenderViewHost* message_source_;
 
   DISALLOW_COPY_AND_ASSIGN(WebContentsImpl);
 };
 
 #endif  // CONTENT_BROWSER_WEB_CONTENTS_WEB_CONTENTS_IMPL_H_