Revert "Move core web_view code to extensions." (patchset #6 of https://codereview.chromium.org/4968

chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.cc

 // 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.
 
 
 #include "chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.h"
 
-#include "chrome/browser/extensions/api/web_request/web_request_api.h"
 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/favicon/favicon_tab_helper.h"
+#include "chrome/browser/guest_view/web_view/web_view_constants.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
 #include "chrome/browser/ui/pdf/pdf_tab_helper.h"
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "chrome/common/chrome_version_info.h"
 #include "components/renderer_context_menu/context_menu_delegate.h"
 #include "content/public/common/page_zoom.h"
-#include "extensions/browser/guest_view/web_view/web_view_constants.h"
 
 #if defined(ENABLE_PRINTING)
 #if defined(ENABLE_FULL_PRINTING)
 #include "chrome/browser/printing/print_preview_message_handler.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #else
 #include "chrome/browser/printing/print_view_manager_basic.h"
 #endif  // defined(ENABLE_FULL_PRINTING)
 #endif  // defined(ENABLE_PRINTING)
 
-void RemoveWebViewEventListenersOnIOThread(
-    void* profile,
-    const std::string& extension_id,
-    int embedder_process_id,
-    int view_instance_id) {
-  DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::IO));
-  ExtensionWebRequestEventRouter::GetInstance()->RemoveWebViewEventListeners(
-      profile,
-      extension_id,
-      embedder_process_id,
-      view_instance_id);
-}
-
 ChromeWebViewGuestDelegate::ChromeWebViewGuestDelegate(
     extensions::WebViewGuest* web_view_guest)
-  : WebViewGuestDelegate(web_view_guest),
+  : WebViewGuestDelegate(),
     pending_context_menu_request_id_(0),
     chromevox_injected_(false),
-    current_zoom_factor_(1.0) {
+    current_zoom_factor_(1.0),
+    web_view_guest_(web_view_guest) {
 }
 
 ChromeWebViewGuestDelegate::~ChromeWebViewGuestDelegate() {
 }
 
 double ChromeWebViewGuestDelegate::GetZoom() {
   return current_zoom_factor_;
 }
 
 bool ChromeWebViewGuestDelegate::HandleContextMenu(
     const content::ContextMenuParams& params) {
   ContextMenuDelegate* menu_delegate =
       ContextMenuDelegate::FromWebContents(guest_web_contents());
   DCHECK(menu_delegate);
 
   pending_menu_ = menu_delegate->BuildMenu(guest_web_contents(), params);
 
   // Pass it to embedder.
   int request_id = ++pending_context_menu_request_id_;
   scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
   scoped_ptr<base::ListValue> items =
       MenuModelToValue(pending_menu_->menu_model());
   args->Set(webview::kContextMenuItems, items.release());
   args->SetInteger(webview::kRequestId, request_id);
-  web_view_guest()->DispatchEventToEmbedder(
+  web_view_guest_->DispatchEventToEmbedder(
       new extensions::GuestViewBase::Event(
           webview::kEventContextMenu, args.Pass()));
   return true;
 }
 
 // TODO(hanxi) Investigate which of these observers should move to the
 // extension module in the future.
 void ChromeWebViewGuestDelegate::OnAttachWebViewHelpers(
     content::WebContents* contents) {
   // Create a zoom controller for the guest contents give it access to
@@ skipping 11 matching lines @@
 #if defined(ENABLE_FULL_PRINTING)
   printing::PrintViewManager::CreateForWebContents(contents);
   printing::PrintPreviewMessageHandler::CreateForWebContents(contents);
 #else
   printing::PrintViewManagerBasic::CreateForWebContents(contents);
 #endif  // defined(ENABLE_FULL_PRINTING)
 #endif  // defined(ENABLE_PRINTING)
   PDFTabHelper::CreateForWebContents(contents);
 }
 
-void ChromeWebViewGuestDelegate::OnEmbedderDestroyed() {
-  // TODO(fsamuel): WebRequest event listeners for <webview> should survive
-  // reparenting of a <webview> within a single embedder. Right now, we keep
-  // around the browser state for the listener for the lifetime of the embedder.
-  // Ideally, the lifetime of the listeners should match the lifetime of the
-  // <webview> DOM node. Once http://crbug.com/156219 is resolved we can move
-  // the call to RemoveWebViewEventListenersOnIOThread back to
-  // WebViewGuest::WebContentsDestroyed.
-  content::BrowserThread::PostTask(
-      content::BrowserThread::IO,
-      FROM_HERE,
-      base::Bind(
-          &RemoveWebViewEventListenersOnIOThread,
-          web_view_guest()->browser_context(),
-          web_view_guest()->embedder_extension_id(),
-          web_view_guest()->embedder_render_process_id(),
-          web_view_guest()->view_instance_id()));
-}
-
 void ChromeWebViewGuestDelegate::OnDidCommitProvisionalLoadForFrame(
     bool is_main_frame) {
   // Update the current zoom factor for the new page.
   ZoomController* zoom_controller =
       ZoomController::FromWebContents(guest_web_contents());
   DCHECK(zoom_controller);
   current_zoom_factor_ = zoom_controller->GetZoomLevel();
   if (is_main_frame)
     chromevox_injected_ = false;
 }
@@ skipping 11 matching lines @@
 
 void ChromeWebViewGuestDelegate::OnDocumentLoadedInFrame(
     content::RenderFrameHost* render_frame_host) {
   if (!render_frame_host->GetParent())
     InjectChromeVoxIfNeeded(render_frame_host->GetRenderViewHost());
 }
 
 void ChromeWebViewGuestDelegate::OnGuestDestroyed() {
   // Clean up custom context menu items for this guest.
   extensions::MenuManager* menu_manager = extensions::MenuManager::Get(
-      Profile::FromBrowserContext(web_view_guest()->browser_context()));
+      Profile::FromBrowserContext(web_view_guest_->browser_context()));
   menu_manager->RemoveAllContextItems(extensions::MenuItem::ExtensionKey(
-      web_view_guest()->embedder_extension_id(),
-      web_view_guest()->view_instance_id()));
+      web_view_guest_->embedder_extension_id(),
+      web_view_guest_->view_instance_id()));
 }
 
 // static
 scoped_ptr<base::ListValue> ChromeWebViewGuestDelegate::MenuModelToValue(
     const ui::SimpleMenuModel& menu_model) {
   scoped_ptr<base::ListValue> items(new base::ListValue());
   for (int i = 0; i < menu_model.GetItemCount(); ++i) {
     base::DictionaryValue* item_value = new base::DictionaryValue();
     // TODO(lazyboy): We need to expose some kind of enum equivalent of
     // |command_id| instead of plain integers.
     item_value->SetInteger(webview::kMenuItemCommandId,
                            menu_model.GetCommandIdAt(i));
     item_value->SetString(webview::kMenuItemLabel, menu_model.GetLabelAt(i));
     items->Append(item_value);
   }
   return items.Pass();
 }
 
 void ChromeWebViewGuestDelegate::OnSetZoom(double zoom_factor) {
   ZoomController* zoom_controller =
       ZoomController::FromWebContents(guest_web_contents());
   DCHECK(zoom_controller);
   double zoom_level = content::ZoomFactorToZoomLevel(zoom_factor);
   zoom_controller->SetZoomLevel(zoom_level);
 
   scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
   args->SetDouble(webview::kOldZoomFactor, current_zoom_factor_);
   args->SetDouble(webview::kNewZoomFactor, zoom_factor);
-  web_view_guest()->DispatchEventToEmbedder(
+  web_view_guest_->DispatchEventToEmbedder(
       new extensions::GuestViewBase::Event(
           webview::kEventZoomChange, args.Pass()));
   current_zoom_factor_ = zoom_factor;
 }
 
 void ChromeWebViewGuestDelegate::OnShowContextMenu(
     int request_id,
     const MenuItemVector* items) {
   if (!pending_menu_.get())
     return;
@@ skipping 31 matching lines @@
     accessibility_subscription_.reset();
   } else if (details.notification_type ==
       chromeos::ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK) {
     if (details.enabled)
       InjectChromeVoxIfNeeded(guest_web_contents()->GetRenderViewHost());
     else
       chromevox_injected_ = false;
   }
 }
 #endif