Move ContentWindow from BrowserPlugin To GuestView

content/public/browser/browser_plugin_guest_delegate.h

Index: content/public/browser/browser_plugin_guest_delegate.h
diff --git a/content/public/browser/browser_plugin_guest_delegate.h b/content/public/browser/browser_plugin_guest_delegate.h
index 22a346b08de7caa2c664bd4aa6f8444ce2a3c28b..a60bc470112c57636198d7e1fd683f16e942508e 100644
--- a/content/public/browser/browser_plugin_guest_delegate.h
+++ b/content/public/browser/browser_plugin_guest_delegate.h
@@ -28,13 +28,14 @@ class CONTENT_EXPORT BrowserPluginGuestDelegate {
 
   // Notification that the embedder will begin attachment. This is called
   // prior to resuming resource loads.
-  virtual void WillAttach(content::WebContents* embedder_web_contents) {}
+  virtual void WillAttach(content::WebContents* embedder_web_contents,
+                          int element_instance_id) {}

[Charlie Reis, 2014/09/17 21:46:43]

Please document these new parameters, since this is the public .h file.  The
meaning of |guest_routing_id| in particular isn't obvious.

[Fady Samuel, 2014/09/17 22:05:46]

Done.

 
   virtual WebContents* CreateNewGuestWindow(
       const WebContents::CreateParams& create_params);
 
   // Notification that the embedder has completed attachment.
-  virtual void DidAttach() {}
+  virtual void DidAttach(int guest_routing_id) {}
 
   // Notification that the BrowserPlugin has resized.
   virtual void ElementSizeChanged(const gfx::Size& old_size,