Towards Decoupling GuestView from Extensions

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/chrome_extension_web_contents_observer.h"
 #include "chrome/browser/favicon/favicon_helper.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/renderer_context_menu/render_view_context_menu.h"
 #include "chrome/browser/ui/pdf/chrome_pdf_web_contents_helper_client.h"
 #include "chrome/common/chrome_version_info.h"
 #include "components/browsing_data/storage_partition_http_cache_data_remover.h"
 #include "components/pdf/browser/pdf_web_contents_helper.h"
 #include "components/renderer_context_menu/context_menu_delegate.h"
 #include "components/web_cache/browser/web_cache_manager.h"
 #include "content/public/browser/render_process_host.h"
 #include "extensions/browser/api/web_request/web_request_api.h"
+#include "extensions/browser/guest_view/guest_view_event.h"
 #include "extensions/browser/guest_view/web_view/web_view_constants.h"
 
 #if defined(ENABLE_PRINTING)
 #if defined(ENABLE_PRINT_PREVIEW)
 #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_PRINT_PREVIEW)
 #endif  // defined(ENABLE_PRINTING)
@@ skipping 42 matching lines @@
   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()->DispatchEventToView(
-      new GuestViewBase::Event(webview::kEventContextMenuShow, args.Pass()));
+      new GuestViewEvent(web_view_guest(),
+                         webview::kEventContextMenuShow,
+                         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) {
   favicon::CreateContentFaviconDriverForWebContents(contents);
   ChromeExtensionWebContentsObserver::CreateForWebContents(contents);
 #if defined(ENABLE_PRINTING)
@@ skipping 99 matching lines @@
       chromeos::ACCESSIBILITY_TOGGLE_SPOKEN_FEEDBACK) {
     if (details.enabled)
       InjectChromeVoxIfNeeded(guest_web_contents()->GetRenderViewHost());
     else
       chromevox_injected_ = false;
   }
 }
 #endif
 
 }  // namespace extensions