| Index: extensions/browser/guest_view/guest_view_base.h
|
| diff --git a/extensions/browser/guest_view/guest_view_base.h b/extensions/browser/guest_view/guest_view_base.h
|
| index 2360ee0bad1fb826197cccc751eaaa2fe8778523..8ce638c6f492624ba0beed54e3659e0515075dc3 100644
|
| --- a/extensions/browser/guest_view/guest_view_base.h
|
| +++ b/extensions/browser/guest_view/guest_view_base.h
|
| @@ -192,11 +192,9 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
|
| 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_; }
|
| @@ -204,6 +202,9 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
|
| // 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_;
|
| @@ -222,6 +223,8 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
|
| return opener_.get();
|
| }
|
|
|
| + // Sets some additional chrome/ initialization parameters.
|
| + void SetAttachParams(const base::DictionaryValue& params);
|
| void SetOpener(GuestViewBase* opener);
|
|
|
| // RenderProcessHostObserver implementation
|
| @@ -235,14 +238,12 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
|
| 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);
|
| @@ -299,11 +300,11 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
|
|
|
| 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_;
|
|
|
|
|