| Index: chrome/browser/guest_view/guest_view_base.h
|
| diff --git a/chrome/browser/guest_view/guest_view_base.h b/chrome/browser/guest_view/guest_view_base.h
|
| index cbcf9cf0faf32034d31b9ae210e80d73795282f2..366c830be7e1d608f5a6858e5c7c7085a0aea689 100644
|
| --- a/chrome/browser/guest_view/guest_view_base.h
|
| +++ b/chrome/browser/guest_view/guest_view_base.h
|
| @@ -192,9 +192,7 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
|
|
|
| // Returns the extra parameters associated with this GuestView passed
|
| // in from JavaScript.
|
| - base::DictionaryValue* extra_params() const {
|
| - return extra_params_.get();
|
| - }
|
| + base::DictionaryValue* attach_params() const { return attach_params_.get(); }
|
|
|
| // Returns whether this guest has an associated embedder.
|
| bool attached() const { return !!embedder_web_contents_; }
|
| @@ -220,6 +218,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
|
| @@ -239,8 +239,7 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
|
| 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);
|
| @@ -301,7 +300,7 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate,
|
| // 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_;
|
| + scoped_ptr<base::DictionaryValue> attach_params_;
|
|
|
| scoped_ptr<EmbedderWebContentsObserver> embedder_web_contents_observer_;
|
|
|
|
|