Move guest lifetime management to chrome

chrome/browser/guest_view/web_view/web_view_guest.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 CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
 #define CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_
 
 #include <vector>
 
 #include "base/observer_list.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/guest_view/guest_view.h"
 #include "chrome/browser/guest_view/web_view/javascript_dialog_helper.h"
 #include "chrome/browser/guest_view/web_view/web_view_find_helper.h"
 #include "chrome/browser/guest_view/web_view/web_view_permission_types.h"
 #include "chrome/common/extensions/api/webview.h"
 #include "content/public/browser/javascript_dialog_manager.h"
 #include "content/public/browser/notification_registrar.h"
-#include "content/public/browser/web_contents_observer.h"
 #include "third_party/WebKit/public/web/WebFindOptions.h"
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
 #endif
 
 namespace webview_api = extensions::api::webview;
 
 class RenderViewContextMenu;
 
 namespace extensions {
 class ScriptExecutor;
 class WebviewFindFunction;
 }  // namespace extensions
 
 namespace ui {
 class SimpleMenuModel;
 }  // namespace ui
 
-// A WebViewGuest is a WebContentsObserver on the guest WebContents of a
-// <webview> tag. It provides the browser-side implementation of the <webview>
-// API and manages the lifetime of <webview> extension events. WebViewGuest is
+// A WebViewGuest provides the browser-side implementation of the <webview> API
+// and manages the dispatch of <webview> extension events. WebViewGuest is
 // created on attachment. That is, when a guest WebContents is associated with
 // a particular embedder WebContents. This happens on either initial navigation
 // or through the use of the New Window API, when a new window is attached to
 // a particular <webview>.
 class WebViewGuest : public GuestView<WebViewGuest>,
-                     public content::NotificationObserver,
-                     public content::WebContentsObserver {
+                     public content::NotificationObserver {
  public:
   WebViewGuest(int guest_instance_id,
                content::WebContents* guest_web_contents,
                const std::string& embedder_extension_id);
 
   // Returns guestview::kInstanceIDNone if |contents| does not correspond to a
   // WebViewGuest.
   static int GetViewInstanceId(content::WebContents* contents);
   static const char Type[];
 
   typedef std::vector<linked_ptr<webview_api::ContextMenuItem> > MenuItemVector;
   // Shows the context menu for the guest.
   // |items| acts as a filter. This restricts the current context's default
   // menu items to contain only the items from |items|.
   // |items| == NULL means no filtering will be applied.
   void ShowContextMenu(int request_id, const MenuItemVector* items);
 
   // Sets the frame name of the guest.
   void SetName(const std::string& name);
 
   // GuestViewBase implementation.
   virtual void Attach(content::WebContents* embedder_web_contents,
                       const base::DictionaryValue& args) OVERRIDE;
-
-  // BrowserPluginGuestDelegate public implementation.
-  virtual bool HandleContextMenu(
-      const content::ContextMenuParams& params) OVERRIDE;
+  virtual void EmbedderDestroyed() OVERRIDE;
 
   // WebContentsDelegate implementation.
   virtual bool AddMessageToConsole(content::WebContents* source,
                                    int32 level,
                                    const base::string16& message,
                                    int32 line_no,
                                    const base::string16& source_id) OVERRIDE;
   virtual void LoadProgressChanged(content::WebContents* source,
                                    double progress) OVERRIDE;
   virtual void CloseContents(content::WebContents* source) OVERRIDE;
   virtual void FindReply(content::WebContents* source,
                          int request_id,
                          int number_of_matches,
                          const gfx::Rect& selection_rect,
                          int active_match_ordinal,
                          bool final_update) OVERRIDE;
+  virtual bool HandleContextMenu(
+      const content::ContextMenuParams& params) OVERRIDE;
   virtual void HandleKeyboardEvent(
       content::WebContents* source,
       const content::NativeWebKeyboardEvent& event) OVERRIDE;
   virtual void RendererResponsive(content::WebContents* source) OVERRIDE;
   virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE;
   virtual void RequestMediaAccessPermission(
       content::WebContents* source,
       const content::MediaStreamRequest& request,
       const content::MediaResponseCallback& callback) OVERRIDE;
   virtual void CanDownload(content::RenderViewHost* render_view_host,
@@ skipping 17 matching lines @@
                               bool* was_blocked) OVERRIDE;
   virtual content::WebContents* OpenURLFromTab(
       content::WebContents* source,
       const content::OpenURLParams& params) OVERRIDE;
   virtual void WebContentsCreated(content::WebContents* source_contents,
                                   int opener_render_frame_id,
                                   const base::string16& frame_name,
                                   const GURL& target_url,
                                   content::WebContents* new_contents) OVERRIDE;
 
-  // GuestDelegate implementation.
+  // BrowserPluginGuestDelegate implementation.
   virtual void DidAttach() OVERRIDE;
-  virtual void EmbedderDestroyed() OVERRIDE;
   virtual bool IsDragAndDropEnabled() OVERRIDE;
   virtual void SizeChanged(const gfx::Size& old_size, const gfx::Size& new_size)
       OVERRIDE;
   virtual void RequestPointerLockPermission(
       bool user_gesture,
       bool last_unlocked_by_target,
       const base::Callback<void(bool)>& callback) OVERRIDE;
   virtual void NavigateGuest(const std::string& src) OVERRIDE;
   virtual void Destroy() OVERRIDE;
 
@@ skipping 293 matching lines @@
         name(name) {}
   };
 
   typedef std::map<WebViewGuest*, NewWindowInfo> PendingWindowMap;
   PendingWindowMap pending_new_windows_;
 
   DISALLOW_COPY_AND_ASSIGN(WebViewGuest);
 };
 
 #endif  // CHROME_BROWSER_GUEST_VIEW_WEB_VIEW_WEB_VIEW_GUEST_H_