Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(889)

Unified Diff: chrome/browser/guest_view/guest_view_base.h

Issue 444813002: Remove BrowserPlugin's -internal-attach method (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: All tests pass Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 0f1cd1cf6f97a694830477fb4ce5a9333d431f83..e09a228d7c5c3d6795f2b97355c81db3278a1436 100644
--- a/chrome/browser/guest_view/guest_view_base.h
+++ b/chrome/browser/guest_view/guest_view_base.h
@@ -196,9 +196,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_; }
@@ -224,6 +222,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
@@ -243,8 +243,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);
@@ -305,7 +304,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_;
Xi Han 2014/08/12 18:17:54 Please update the first line of the description: "
Fady Samuel 2014/08/13 22:24:39 Done.
scoped_ptr<EmbedderWebContentsObserver> embedder_web_contents_observer_;
« no previous file with comments | « chrome/browser/guest_view/extension_options/extension_options_guest.cc ('k') | chrome/browser/guest_view/guest_view_base.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698