Remove BrowserPlugin's -internal-attach method

extensions/browser/guest_view/guest_view_base.h

 // Copyright 2014 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 EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_BASE_H_
 #define EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_BASE_H_
 
 #include <queue>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 174 matching lines @@
 
   content::WebContents* embedder_web_contents() const {
     return embedder_web_contents_;
   }
 
   // Returns the guest WebContents.
   content::WebContents* guest_web_contents() const {
     return web_contents();
   }
 
-  // Returns the extra parameters associated with this GuestView passed
-  // in from JavaScript.
-  base::DictionaryValue* extra_params() const {
-    return extra_params_.get();
-  }
+  // Returns the parameters associated with the element hosting this GuestView
+  // passed in from JavaScript.
+  base::DictionaryValue* attach_params() const { return attach_params_.get(); }
 
   // Returns whether this guest has an associated embedder.
   bool attached() const { return !!embedder_web_contents_; }
 
   // Returns the instance ID of the <*view> element.
   int view_instance_id() const { return view_instance_id_; }
 
+  // Returns the instance ID of this GuestViewBase.
+  int guest_instance_id() const { return guest_instance_id_; }
+
   // Returns the extension ID of the embedder.
   const std::string& embedder_extension_id() const {
     return embedder_extension_id_;
   }
 
   // Returns whether this GuestView is embedded in an extension/app.
   bool in_extension() const { return !embedder_extension_id_.empty(); }
 
   // Returns the user browser context of the embedder.
   content::BrowserContext* browser_context() const { return browser_context_; }
 
   // Returns the embedder's process ID.
   int embedder_render_process_id() const { return embedder_render_process_id_; }
 
   GuestViewBase* GetOpener() const {
     return opener_.get();
   }
 
+  // Sets some additional chrome/ initialization parameters.
+  void SetAttachParams(const base::DictionaryValue& params);
   void SetOpener(GuestViewBase* opener);
 
   // RenderProcessHostObserver implementation
   virtual void RenderProcessExited(content::RenderProcessHost* host,
                                    base::ProcessHandle handle,
                                    base::TerminationStatus status,
                                    int exit_code) OVERRIDE;
 
   // BrowserPluginGuestDelegate implementation.
   virtual void Destroy() OVERRIDE FINAL;
   virtual void DidAttach() OVERRIDE FINAL;
   virtual void ElementSizeChanged(const gfx::Size& old_size,
                                   const gfx::Size& new_size) OVERRIDE FINAL;
-  virtual int GetGuestInstanceID() const OVERRIDE;
   virtual void GuestSizeChanged(const gfx::Size& old_size,
                                 const gfx::Size& new_size) OVERRIDE FINAL;
   virtual void RegisterDestructionCallback(
       const DestructionCallback& callback) OVERRIDE FINAL;
   virtual void WillAttach(
-      content::WebContents* embedder_web_contents,
-      const base::DictionaryValue& extra_params) OVERRIDE FINAL;
+      content::WebContents* embedder_web_contents) OVERRIDE FINAL;
 
   // Dispatches an event |event_name| to the embedder with the |event| fields.
   void DispatchEventToEmbedder(Event* event);
 
  protected:
   GuestViewBase(content::BrowserContext* browser_context,
                 int guest_instance_id);
 
   virtual ~GuestViewBase();
 
@@ skipping 36 matching lines @@
 
   // This is a queue of Events that are destined to be sent to the embedder once
   // the guest is attached to a particular embedder.
   std::deque<linked_ptr<Event> > pending_events_;
 
   // The opener guest view.
   base::WeakPtr<GuestViewBase> opener_;
 
   DestructionCallback destruction_callback_;
 
-  // The extra parameters associated with this GuestView passed
-  // in from JavaScript. This will typically be the view instance ID,
-  // the API to use, and view-specific parameters. These parameters
-  // are passed along to new guests that are created from this guest.
-  scoped_ptr<base::DictionaryValue> extra_params_;
+  // The parameters associated with the element hosting this GuestView that
+  // are passed in from JavaScript. This will typically be the view instance ID,
+  // and element-specific parameters. These parameters are passed along to new
+  // guests that are created from this guest.
+  scoped_ptr<base::DictionaryValue> attach_params_;
 
   scoped_ptr<EmbedderWebContentsObserver> embedder_web_contents_observer_;
 
   // The size of the container element.
   gfx::Size element_size_;
 
   // The size of the guest content. Note: In autosize mode, the container
   // element may not match the size of the guest.
   gfx::Size guest_size_;
 
   // Indicates whether autosize mode is enabled or not.
   bool auto_size_enabled_;
 
   // The maximum size constraints of the container element in autosize mode.
   gfx::Size max_auto_size_;
 
   // The minimum size constraints of the container element in autosize mode.
   gfx::Size min_auto_size_;
 
   // This is used to ensure pending tasks will not fire after this object is
   // destroyed.
   base::WeakPtrFactory<GuestViewBase> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GuestViewBase);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_BASE_H_