Remove BrowserPlugin's -internal-attach method

content/renderer/browser_plugin/browser_plugin_manager.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_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_MANAGER_H_
 #define CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_MANAGER_H_
 
 #include "base/id_map.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/observer_list.h"
 #include "content/public/renderer/render_view_observer.h"
 #include "ipc/ipc_sender.h"
 
+namespace base {
+class DictionaryValue;
+}
+
 namespace blink {
 class WebFrame;
+class WebNode;
 struct WebPluginParams;
 }
 
 namespace content {
 
 class BrowserPlugin;
 class BrowserPluginManagerFactory;
 class RenderViewImpl;
 
 // BrowserPluginManager manages the routing of messages to the appropriate
@@ skipping 15 matching lines @@
 
   // Creates a new BrowserPlugin object.
   // BrowserPlugin is responsible for associating itself with the
   // BrowserPluginManager via AddBrowserPlugin. When it is destroyed, it is
   // responsible for removing its association via RemoveBrowserPlugin.
   virtual BrowserPlugin* CreateBrowserPlugin(
       RenderViewImpl* render_view,
       blink::WebFrame* frame,
       bool auto_navigate) = 0;
 
+  void Attach(int browser_plugin_instance_id, int guest_instance_id);
+
   void AddBrowserPlugin(int guest_instance_id, BrowserPlugin* browser_plugin);
   void RemoveBrowserPlugin(int guest_instance_id);
   BrowserPlugin* GetBrowserPlugin(int guest_instance_id) const;
+
+  void AddBrowserPluginInternal(int browser_plugin_instance_id,
+                                BrowserPlugin* browser_plugin);
+  void RemoveBrowserPluginInternal(int browser_plugin_instance_id);
+  BrowserPlugin* GetBrowserPluginInternal(int browser_plugin_instance_id) const;
+
   void UpdateDeviceScaleFactor(float device_scale_factor);
   void UpdateFocusState();
   RenderViewImpl* render_view() const { return render_view_.get(); }
+  int GetNextInstanceID();
 
   // RenderViewObserver implementation.
 
   // BrowserPluginManager must override the default Send behavior.
   virtual bool Send(IPC::Message* msg) OVERRIDE = 0;
 
   // Don't destroy the BrowserPluginManager when the RenderViewImpl goes away.
   // BrowserPluginManager's lifetime is managed by a reference count. Once
   // the host RenderViewImpl and all BrowserPlugins release their references,
   // then the BrowserPluginManager will be destroyed.
   virtual void OnDestruct() OVERRIDE {}
 
  protected:
   // Friend RefCounted so that the dtor can be non-public.
   friend class base::RefCounted<BrowserPluginManager>;
 
   // Static factory instance (always NULL for non-test).
   static BrowserPluginManagerFactory* factory_;
 
   virtual ~BrowserPluginManager();
   // This map is keyed by guest instance IDs.
-  IDMap<BrowserPlugin> instances_;
+  IDMap<BrowserPlugin> instances_by_guest_id_;
+  // This map is keyed by browser plugin instance IDs.
+  // TODO(lazyboy): |instances_| would go away once we can route messages using
+  // internal IDs.
+  IDMap<BrowserPlugin> instances_by_browser_plugin_id_;
+  int next_instance_id_;
   base::WeakPtr<RenderViewImpl> render_view_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPluginManager);
 };
 
 }  // namespace content
 
 #endif //  CONTENT_RENDERER_BROWSER_PLUGIN_BROWSER_PLUGIN_MANAGER_H_