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 1c0625cd6e9aa1c17f40d86336125a72645229d9..4ca47149afcd7a31932db0b1ecfd201088e21c11 100644 |
--- a/extensions/browser/guest_view/guest_view_base.h |
+++ b/extensions/browser/guest_view/guest_view_base.h |
@@ -235,7 +235,7 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate, |
// BrowserPluginGuestDelegate implementation. |
virtual void Destroy() OVERRIDE FINAL; |
- virtual void DidAttach() OVERRIDE FINAL; |
+ virtual void DidAttach(int guest_proxy_routing_id) OVERRIDE FINAL; |
virtual void ElementSizeChanged(const gfx::Size& old_size, |
const gfx::Size& new_size) OVERRIDE FINAL; |
virtual void GuestSizeChanged(const gfx::Size& old_size, |
@@ -243,7 +243,8 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate, |
virtual void RegisterDestructionCallback( |
const DestructionCallback& callback) OVERRIDE FINAL; |
virtual void WillAttach( |
- content::WebContents* embedder_web_contents) OVERRIDE FINAL; |
+ content::WebContents* embedder_web_contents, |
+ int browser_plugin_instance_id) OVERRIDE FINAL; |
// Dispatches an event |event_name| to the embedder with the |event| fields. |
void DispatchEventToEmbedder(Event* event); |
@@ -288,13 +289,19 @@ class GuestViewBase : public content::BrowserPluginGuestDelegate, |
std::string embedder_extension_id_; |
int embedder_render_process_id_; |
content::BrowserContext* browser_context_; |
+ |
// |guest_instance_id_| is a profile-wide unique identifier for a guest |
// WebContents. |
const int guest_instance_id_; |
+ |
// |view_instance_id_| is an identifier that's unique within a particular |
// embedder RenderViewHost for a particular <*view> instance. |
int view_instance_id_; |
+ // |element_instance_id_| is an identififer that's unique to a particular |
+ // GuestViewContainer element. |
+ int element_instance_id_; |
+ |
bool initialized_; |
// This is a queue of Events that are destined to be sent to the embedder once |