Towards Decoupling GuestView from Extensions

extensions/browser/guest_view/extension_options/extension_options_guest.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 "extensions/browser/guest_view/extension_options/extension_options_guest.h"
 
 #include "base/values.h"
 #include "components/crx_file/id_util.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/result_codes.h"
 #include "extensions/browser/api/extensions_api_client.h"
 #include "extensions/browser/bad_message.h"
 #include "extensions/browser/extension_function_dispatcher.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extension_web_contents_observer.h"
 #include "extensions/browser/guest_view/extension_options/extension_options_constants.h"
 #include "extensions/browser/guest_view/extension_options/extension_options_guest_delegate.h"
+#include "extensions/browser/guest_view/guest_view_event.h"
 #include "extensions/browser/guest_view/guest_view_manager.h"
 #include "extensions/common/api/extension_options_internal.h"
 #include "extensions/common/constants.h"
 #include "extensions/common/extension.h"
 #include "extensions/common/extension_messages.h"
 #include "extensions/common/manifest_handlers/options_page_info.h"
 #include "extensions/common/permissions/permissions_data.h"
 #include "extensions/strings/grit/extensions_strings.h"
 #include "ipc/ipc_message_macros.h"
 
@@ skipping 89 matching lines @@
     extension_options_guest_delegate_->DidInitialize();
   }
   web_contents()->GetController().LoadURL(options_page_,
                                           content::Referrer(),
                                           ui::PAGE_TRANSITION_LINK,
                                           std::string());
 }
 
 void ExtensionOptionsGuest::GuestViewDidStopLoading() {
   scoped_ptr<base::DictionaryValue> args(new base::DictionaryValue());
-  DispatchEventToView(new GuestViewBase::Event(
-      extension_options_internal::OnLoad::kEventName, args.Pass()));
+  DispatchEventToView(new GuestViewEvent(
+      this, extension_options_internal::OnLoad::kEventName, args.Pass()));
 }
 
 const char* ExtensionOptionsGuest::GetAPINamespace() const {
   return extensionoptions::kAPINamespace;
 }
 
 int ExtensionOptionsGuest::GetTaskPrefix() const {
   return IDS_EXTENSION_TASK_MANAGER_EXTENSIONOPTIONS_TAG_PREFIX;
 }
 
 bool ExtensionOptionsGuest::IsPreferredSizeModeEnabled() const {
   return true;
 }
 
 bool ExtensionOptionsGuest::IsDragAndDropEnabled() const {
   return true;
 }
 
 void ExtensionOptionsGuest::OnPreferredSizeChanged(const gfx::Size& pref_size) {
   extension_options_internal::PreferredSizeChangedOptions options;
   // Convert the size from physical pixels to logical pixels.
   options.width = PhysicalPixelsToLogicalPixels(pref_size.width());
   options.height = PhysicalPixelsToLogicalPixels(pref_size.height());
-  DispatchEventToView(new GuestViewBase::Event(
+  DispatchEventToView(new GuestViewEvent(
+      this,
       extension_options_internal::OnPreferredSizeChanged::kEventName,
       options.ToValue()));
 }
 
 content::WebContents* ExtensionOptionsGuest::GetAssociatedWebContents() const {
   return web_contents();
 }
 
 content::WebContents* ExtensionOptionsGuest::OpenURLFromTab(
     content::WebContents* source,
@@ skipping 12 matching lines @@
                                params.frame_tree_node_id,
                                NEW_FOREGROUND_TAB,
                                params.transition,
                                params.is_renderer_initiated));
   }
   return extension_options_guest_delegate_->OpenURLInNewTab(params);
 }
 
 void ExtensionOptionsGuest::CloseContents(content::WebContents* source) {
   DispatchEventToView(
-      new GuestViewBase::Event(extension_options_internal::OnClose::kEventName,
-                               make_scoped_ptr(new base::DictionaryValue())));
+      new GuestViewEvent(this,
+                         extension_options_internal::OnClose::kEventName,
+                         make_scoped_ptr(new base::DictionaryValue())));
 }
 
 bool ExtensionOptionsGuest::HandleContextMenu(
     const content::ContextMenuParams& params) {
   if (!extension_options_guest_delegate_)
     return false;
 
   return extension_options_guest_delegate_->HandleContextMenu(params);
 }
 
@@ skipping 50 matching lines @@
   return handled;
 }
 
 void ExtensionOptionsGuest::OnRequest(
     const ExtensionHostMsg_Request_Params& params) {
   extension_function_dispatcher_->Dispatch(params,
                                            web_contents()->GetRenderViewHost());
 }
 
 }  // namespace extensions