Move ContentWindow from BrowserPlugin To GuestView

extensions/browser/guest_view/guest_view_base.h

 // Copyright 2014 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 EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_BASE_H_
 #define EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_BASE_H_
 
 #include <queue>
 
 #include "base/memory/weak_ptr.h"
@@ skipping 217 matching lines @@
   void SetOpener(GuestViewBase* opener);
 
   // RenderProcessHostObserver implementation
   virtual void RenderProcessExited(content::RenderProcessHost* host,
                                    base::ProcessHandle handle,
                                    base::TerminationStatus status,
                                    int exit_code) OVERRIDE;
 
   // 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,
                                 const gfx::Size& new_size) OVERRIDE FINAL;
   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);
 
  protected:
   GuestViewBase(content::BrowserContext* browser_context,
                 int guest_instance_id);
 
   virtual ~GuestViewBase();
 
@@ skipping 24 matching lines @@
       const content::FileChooserParams& params) OVERRIDE;
   virtual bool ShouldFocusPageAfterCrash() OVERRIDE FINAL;
   virtual bool PreHandleGestureEvent(
       content::WebContents* source,
       const blink::WebGestureEvent& event) OVERRIDE FINAL;
 
   content::WebContents* embedder_web_contents_;
   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
   // the guest is attached to a particular embedder.
   std::deque<linked_ptr<Event> > pending_events_;
 
   // The opener guest view.
   base::WeakPtr<GuestViewBase> opener_;
 
   DestructionCallback destruction_callback_;
@@ skipping 25 matching lines @@
   // This is used to ensure pending tasks will not fire after this object is
   // destroyed.
   base::WeakPtrFactory<GuestViewBase> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(GuestViewBase);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_GUEST_VIEW_GUEST_VIEW_BASE_H_