Move ContentWindow from BrowserPlugin To GuestView

content/public/browser/browser_plugin_guest_delegate.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_PUBLIC_BROWSER_BROWSER_PLUGIN_GUEST_DELEGATE_H_
 #define CONTENT_PUBLIC_BROWSER_BROWSER_PLUGIN_GUEST_DELEGATE_H_
 
 #include "base/callback_forward.h"
 #include "base/process/kill.h"
 #include "content/common/content_export.h"
@@ skipping 10 matching lines @@
 namespace content {
 
 // Objects implement this interface to get notified about changes in the guest
 // WebContents and to provide necessary functionality.
 class CONTENT_EXPORT BrowserPluginGuestDelegate {
  public:
   virtual ~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,
                                   const gfx::Size& new_size) {}
 
   // Notifies that the content size of the guest has changed.
   // Note: In autosize mode, it si possible that the guest size may not match
   // the element size.
   virtual void GuestSizeChanged(const gfx::Size& old_size,
                                 const gfx::Size& new_size) {}
@@ skipping 12 matching lines @@
   // Registers a |callback| with the delegate that the delegate would call when
   // it is about to be destroyed.
   typedef base::Callback<void()> DestructionCallback;
   virtual void RegisterDestructionCallback(
       const DestructionCallback& callback) {}
 };
 
 }  // namespace content
 
 #endif  // CONTENT_PUBLIC_BROWSER_BROWSER_PLUGIN_GUEST_DELEGATE_H_