Browser Plugin: Allocate Instance IDs in BrowserPluginEmbedder instead of BrowserPluginManager

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);
 
-  // Create a guest WebContents with the provided |instance_id| and |params| and
-  // add it to this BrowserPluginEmbedder. Optionally, the new guest may be
-  // attached to a |guest_opener|, and may be attached to a pre-selected
-  // |routing_id|.
+  // Creates a guest WebContents with the provided |instance_id| and |params|
+  // and adds it to this BrowserPluginEmbedder. If params.src is present, the
+  // new guest will also be navigated to the provided URL. Optionally, the new
+  // guest may be attached to a |guest_opener|, and may be attached to a pre-
+  // selected |routing_id|.
   void CreateGuest(int instance_id,
                    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.
+  // Destroys the guest with the provided |instance_id|. Removes references to
+  // the guest in this BrowserPluginEmbedder.
   void DestroyGuestByInstanceID(int instance_id);
 
   // 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_; }
 
@@ skipping 26 matching lines @@
   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.
 
+  void OnAllocateInstanceID(int request_id);
   void OnCreateGuest(int instance_id,
                      const BrowserPluginHostMsg_CreateGuest_Params& params);
   void OnPluginAtPositionResponse(int instance_id,
                                   int request_id,
                                   const gfx::Point& position);
   void OnPluginDestroyed(int instance_id);
   void OnSwapBuffersACK(int route_id,
                         int gpu_host_id,
                         const std::string& mailbox_name,
                         uint32 sync_point);
@@ skipping 10 matching lines @@
   // Tracks the visibility state of the embedder.
   bool visible_;
   // Map that contains outstanding queries to |GetBrowserPluginAt|.
   // We need a roundtrip to renderer process to know the answer, therefore
   // storing these callbacks is required.
   typedef std::map<int, WebContents::GetRenderViewHostCallback>
       GetRenderViewHostCallbackMap;
   GetRenderViewHostCallbackMap pending_get_render_view_callbacks_;
   // Next request id for BrowserPluginMsg_PluginAtPositionRequest query.
   int next_get_render_view_request_id_;
+  int next_instance_id_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginEmbedder);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_BROWSER_BROWSER_PLUGIN_BROWSER_PLUGIN_EMBEDDER_H_