Browser Plugin: Refactor BrowserPluginEmbedder to allow creating guests with openers

content/browser/browser_plugin/browser_plugin_embedder.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.
 
 // A BrowserPluginEmbedder has a list of guests it manages.
 // In the beginning when a renderer sees one or more guests (BrowserPlugin
 // instance(s)) and there is a request to navigate to them, the WebContents for
 // that renderer creates a BrowserPluginEmbedder for itself. The
 // BrowserPluginEmbedder, in turn, manages a set of BrowserPluginGuests -- one
 // BrowserPluginGuest for each guest in the embedding WebContents. Note that
@@ skipping 39 matching lines @@
 class CONTENT_EXPORT BrowserPluginEmbedder : public WebContentsObserver,
                                              public NotificationObserver {
  public:
   typedef std::map<int, WebContents*> ContainerInstanceMap;
 
   virtual ~BrowserPluginEmbedder();
 
   static BrowserPluginEmbedder* Create(WebContentsImpl* web_contents,
                                        RenderViewHost* render_view_host);
 
+  void CreateGuest(int instance_id,

[sadrul, 2013/01/07 15:09:54]

Doc

[Fady Samuel, 2013/01/08 17:00:49]

Done.

+                   int routing_id,
+                   BrowserPluginGuest* guest_opener,
+                   const BrowserPluginHostMsg_CreateGuest_Params& params);
+
+  // Returns a guest browser plugin delegate by its container ID specified
+  // in BrowserPlugin.
+  BrowserPluginGuest* GetGuestByInstanceID(int instance_id) const;
+
+  // Destroy the guest with the provided |instance_id|. Remove references to the
+  // guest in this BrowserPluginEmbedder.
+  void DestroyGuestByInstanceID(int instance_id);

[sadrul, 2013/01/07 15:09:54]

It doesn't look like either GuestGuestByInstanceID or Destroy... is called from
anywhere outside of BPEmbedder. Is exposing these in public necessary for the
follow-on patches?

[Fady Samuel, 2013/01/08 17:00:49]

This will be used by follow-on patches. I am making the simple changes here in
order to simply the review process in follow-on patches.

+
   // Overrides factory for testing. Default (NULL) value indicates regular
   // (non-test) environment.
   static void set_factory_for_testing(BrowserPluginHostFactory* factory) {
     factory_ = factory;
   }
 
   bool visible() const { return visible_; }
 
   // Returns the RenderViewHost at a point (|x|, |y|) asynchronously via
   // |callback|. We need a roundtrip to renderer process to get this
@@ skipping 12 matching lines @@
   virtual void Observe(int type,
                        const NotificationSource& source,
                        const NotificationDetails& details) OVERRIDE;
 
  private:
   friend class TestBrowserPluginEmbedder;
 
   BrowserPluginEmbedder(WebContentsImpl* web_contents,
                         RenderViewHost* render_view_host);
 
-  // Returns a guest browser plugin delegate by its container ID specified
-  // in BrowserPlugin.
-  BrowserPluginGuest* GetGuestByInstanceID(int instance_id) const;
   // Adds a new guest web_contents to the embedder (overridable in test).
   virtual void AddGuest(int instance_id, WebContents* guest_web_contents);
-  void DestroyGuestByInstanceID(int instance_id);
   void CleanUp();
 
   // Called when visiblity of web_contents changes, so the embedder will
   // show/hide its guest.
   void WebContentsVisibilityChanged(bool visible);
 
   static bool ShouldForwardToBrowserPluginGuest(const IPC::Message& message);
 
   // Message handlers.
 
@@ skipping 28 matching lines @@
   GetRenderViewHostCallbackMap pending_get_render_view_callbacks_;
   // Next request id for BrowserPluginMsg_PluginAtPositionRequest query.
   int next_get_render_view_request_id_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginEmbedder);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_EMBEDDER_H_