Move extension messages to their own file and add a RenderViewObserver to start moving the extension code out of RenderView.

TBR=aa
Review URL: http://codereview.chromium.org/6735004

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@79561 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 58 insertions, 80 deletions

diff --git a/content/browser/renderer_host/render_view_host.cc b/content/browser/renderer_host/render_view_host.cc
index 13e9963..bf91d391 100644
--- a/content/browser/renderer_host/render_view_host.cc
+++ b/content/browser/renderer_host/render_view_host.cc
@@ -23,6 +23,7 @@
 #include "chrome/common/bindings_policy.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/common/chrome_switches.h"
+#include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/render_messages.h"
 #include "chrome/common/print_messages.h"
@@ -565,7 +566,7 @@ int RenderViewHost::DownloadFavicon(const GURL& url, int image_size) {
 }
 
 void RenderViewHost::GetApplicationInfo(int32 page_id) {
-  Send(new ViewMsg_GetApplicationInfo(routing_id(), page_id));
+  Send(new ExtensionMsg_GetApplicationInfo(routing_id(), page_id));
 }
 
 void RenderViewHost::CaptureSnapshot() {
@@ -772,10 +773,9 @@ bool RenderViewHost::OnMessageReceived(const IPC::Message& msg) {
     IPC_MESSAGE_HANDLER(ViewHostMsg_TakeFocus, OnTakeFocus)
     IPC_MESSAGE_HANDLER(ViewHostMsg_AddMessageToConsole, OnAddMessageToConsole)
     IPC_MESSAGE_HANDLER(ViewHostMsg_ShouldClose_ACK, OnMsgShouldCloseACK)
-    IPC_MESSAGE_HANDLER(ViewHostMsg_ExtensionRequest, OnExtensionRequest)
+    IPC_MESSAGE_HANDLER(ExtensionHostMsg_Request, OnExtensionRequest)
     IPC_MESSAGE_HANDLER(ViewHostMsg_SelectionChanged, OnMsgSelectionChanged)
-    IPC_MESSAGE_HANDLER(ViewHostMsg_ExtensionPostMessage,
-                        OnExtensionPostMessage)
+    IPC_MESSAGE_HANDLER(ExtensionHostMsg_PostMessage, OnExtensionPostMessage)
     IPC_MESSAGE_HANDLER(ViewHostMsg_AccessibilityNotifications,
                         OnAccessibilityNotifications)
     IPC_MESSAGE_HANDLER(ViewHostMsg_OnCSSInserted, OnCSSInserted)
@@ -1115,7 +1115,7 @@ void RenderViewHost::OnMsgWebUISend(
     }
   }
 
-  ViewHostMsg_DomMessage_Params params;
+  ExtensionHostMsg_DomMessage_Params params;
   params.name = message;
   if (value.get())
     params.arguments.Swap(static_cast<ListValue*>(value.get()));
@@ -1399,7 +1399,7 @@ void RenderViewHost::ForwardMessageFromExternalHost(const std::string& message,
 }
 
 void RenderViewHost::OnExtensionRequest(
-    const ViewHostMsg_DomMessage_Params& params) {
+    const ExtensionHostMsg_DomMessage_Params& params) {
   if (!ChildProcessSecurityPolicy::GetInstance()->
           HasExtensionBindings(process()->id())) {
     // This can happen if someone uses window.open() to open an extension URL
@@ -1414,8 +1414,8 @@ void RenderViewHost::OnExtensionRequest(
 void RenderViewHost::SendExtensionResponse(int request_id, bool success,
                                            const std::string& response,
                                            const std::string& error) {
-  Send(new ViewMsg_ExtensionResponse(routing_id(), request_id, success,
-      response, error));
+  Send(new ExtensionMsg_Response(
+      routing_id(), request_id, success, response, error));
 }
 
 void RenderViewHost::BlockExtensionRequest(int request_id) {
diff --git a/content/browser/renderer_host/render_view_host.h b/content/browser/renderer_host/render_view_host.h
index d45c749..d40b8c7 100644
--- a/content/browser/renderer_host/render_view_host.h
+++ b/content/browser/renderer_host/render_view_host.h
@@ -39,10 +39,10 @@ class SkBitmap;
 class ViewMsg_Navigate;
 struct ContentSettings;
 struct ContextMenuParams;
+struct ExtensionHostMsg_DomMessage_Params;
 struct MediaPlayerAction;
 struct ViewHostMsg_AccessibilityNotification_Params;
 struct ViewHostMsg_CreateWindow_Params;
-struct ViewHostMsg_DomMessage_Params;
 struct ViewHostMsg_ShowPopup_Params;
 struct ViewMsg_Navigate_Params;
 struct WebApplicationInfo;
@@ -602,7 +602,7 @@ class RenderViewHost : public RenderWidgetHost {
                                 const std::string& value);
   void OnMsgShouldCloseACK(bool proceed);
 
-  void OnExtensionRequest(const ViewHostMsg_DomMessage_Params& params);
+  void OnExtensionRequest(const ExtensionHostMsg_DomMessage_Params& params);
   void OnExtensionPostMessage(int port_id, const std::string& message);
   void OnAccessibilityNotifications(
       const std::vector<ViewHostMsg_AccessibilityNotification_Params>& params);
diff --git a/content/browser/renderer_host/render_view_host_delegate.h b/content/browser/renderer_host/render_view_host_delegate.h
index be8d04e..3fcc384 100644
--- a/content/browser/renderer_host/render_view_host_delegate.h
+++ b/content/browser/renderer_host/render_view_host_delegate.h
@@ -45,8 +45,8 @@ class SkBitmap;
 class SSLClientAuthHandler;
 class SSLAddCertHandler;
 class TabContents;
+struct ExtensionHostMsg_DomMessage_Params;
 struct ViewHostMsg_CreateWindow_Params;
-struct ViewHostMsg_DomMessage_Params;
 struct ViewHostMsg_FrameNavigate_Params;
 struct WebApplicationInfo;
 struct WebDropData;
@@ -492,7 +492,7 @@ class RenderViewHostDelegate : public IPC::Channel::Listener {
   // A message was sent from HTML-based UI.
   // By default we ignore such messages.
   virtual void ProcessWebUIMessage(
-      const ViewHostMsg_DomMessage_Params& params) {}
+      const ExtensionHostMsg_DomMessage_Params& params) {}
 
   // A message for external host. By default we ignore such messages.
   // |receiver| can be a receiving script and |message| is any
diff --git a/content/browser/tab_contents/tab_contents.cc b/content/browser/tab_contents/tab_contents.cc
index ba82541..7ac1749 100644
--- a/content/browser/tab_contents/tab_contents.cc
+++ b/content/browser/tab_contents/tab_contents.cc
@@ -58,12 +58,12 @@
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_action.h"
 #include "chrome/common/extensions/extension_icon_set.h"
+#include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/extensions/url_pattern.h"
 #include "chrome/common/net/url_request_context_getter.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/common/render_messages_params.h"
 #include "chrome/common/url_constants.h"
 #include "content/browser/child_process_security_policy.h"
 #include "content/browser/host_zoom_map.h"
@@ -417,9 +417,9 @@ bool TabContents::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(ViewHostMsg_PDFHasUnsupportedFeature,
                         OnPDFHasUnsupportedFeature)
     IPC_MESSAGE_HANDLER(ViewHostMsg_GoToEntryAtOffset, OnGoToEntryAtOffset)
-    IPC_MESSAGE_HANDLER(ViewHostMsg_DidGetApplicationInfo,
+    IPC_MESSAGE_HANDLER(ExtensionHostMsg_DidGetApplicationInfo,
                         OnDidGetApplicationInfo)
-    IPC_MESSAGE_HANDLER(ViewHostMsg_InstallApplication,
+    IPC_MESSAGE_HANDLER(ExtensionHostMsg_InstallApplication,
                         OnInstallApplication)
     IPC_MESSAGE_HANDLER(ViewHostMsg_PageContents, OnPageContents)
     IPC_MESSAGE_HANDLER(ViewHostMsg_PageTranslated, OnPageTranslated)
@@ -892,9 +892,13 @@ bool TabContents::ExecuteCode(int request_id, const std::string& extension_id,
   if (!host)
     return false;
 
-  return host->Send(new ViewMsg_ExecuteCode(host->routing_id(),
-      ViewMsg_ExecuteCode_Params(request_id, extension_id,
-                                 is_js_code, code_string, all_frames)));
+  ExtensionMsg_ExecuteCode_Params params;
+  params.request_id = request_id;
+  params.extension_id = extension_id;
+  params.is_javascript = is_js_code;
+  params.code = code_string;
+  params.all_frames = all_frames;
+  return host->Send(new ExtensionMsg_ExecuteCode(host->routing_id(), params));
 }
 
 void TabContents::PopupNotificationVisibilityChanged(bool visible) {
@@ -2314,7 +2318,7 @@ void TabContents::DomOperationResponse(const std::string& json_string,
 }
 
 void TabContents::ProcessWebUIMessage(
-    const ViewHostMsg_DomMessage_Params& params) {
+    const ExtensionHostMsg_DomMessage_Params& params) {
   if (!render_manager_.web_ui()) {
     // This can happen if someone uses window.open() to open an extension URL
     // from a non-extension context.
diff --git a/content/browser/tab_contents/tab_contents.h b/content/browser/tab_contents/tab_contents.h
index 75a54c6..daa7813 100644
--- a/content/browser/tab_contents/tab_contents.h
+++ b/content/browser/tab_contents/tab_contents.h
@@ -79,9 +79,9 @@ class TabContentsObserver;
 class TabContentsSSLHelper;
 class TabContentsView;
 class URLPattern;
+struct ExtensionHostMsg_DomMessage_Params;
 struct RendererPreferences;
 struct ThumbnailScore;
-struct ViewHostMsg_DomMessage_Params;
 struct ViewHostMsg_FrameNavigate_Params;
 struct WebPreferences;
 
@@ -911,7 +911,8 @@ class TabContents : public PageNavigator,
                               WindowOpenDisposition disposition);
   virtual void DomOperationResponse(const std::string& json_string,
                                     int automation_id);
-  virtual void ProcessWebUIMessage(const ViewHostMsg_DomMessage_Params& params);
+  virtual void ProcessWebUIMessage(
+      const ExtensionHostMsg_DomMessage_Params& params);
   virtual void ProcessExternalHostMessage(const std::string& message,
                                           const std::string& origin,
                                           const std::string& target);
diff --git a/content/browser/webui/web_ui.cc b/content/browser/webui/web_ui.cc
index 6a8e8c4..9202958 100644
--- a/content/browser/webui/web_ui.cc
+++ b/content/browser/webui/web_ui.cc
@@ -13,8 +13,8 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/generic_handler.h"
 #include "chrome/common/bindings_policy.h"
+#include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/common/render_messages_params.h"
 #include "content/browser/renderer_host/render_view_host.h"
 #include "content/browser/tab_contents/tab_contents.h"
 #include "content/browser/tab_contents/tab_contents_view.h"
@@ -59,7 +59,8 @@ WebUI::~WebUI() {
 
 // WebUI, public: -------------------------------------------------------------
 
-void WebUI::ProcessWebUIMessage(const ViewHostMsg_DomMessage_Params& params) {
+void WebUI::ProcessWebUIMessage(
+    const ExtensionHostMsg_DomMessage_Params& params) {
   // Look up the callback for this message.
   MessageCallbackMap::const_iterator callback =
       message_callbacks_.find(params.name);
diff --git a/content/browser/webui/web_ui.h b/content/browser/webui/web_ui.h
index 4bcda5d..98adcb1 100644
--- a/content/browser/webui/web_ui.h
+++ b/content/browser/webui/web_ui.h
@@ -22,7 +22,7 @@ class Profile;
 class RenderViewHost;
 class TabContents;
 class Value;
-struct ViewHostMsg_DomMessage_Params;
+struct ExtensionHostMsg_DomMessage_Params;
 
 // A WebUI sets up the datasources and message handlers for a given HTML-based
 // UI. It is contained by a WebUIManager.
@@ -53,7 +53,8 @@ class WebUI {
   virtual void DidBecomeActiveForReusedRenderView() {}
 
   // Called from TabContents.
-  virtual void ProcessWebUIMessage(const ViewHostMsg_DomMessage_Params& params);
+  virtual void ProcessWebUIMessage(
+      const ExtensionHostMsg_DomMessage_Params& params);
 
   // Used by WebUIMessageHandlers.
   typedef Callback1<const ListValue*>::Type MessageCallback;
diff --git a/content/common/view_messages.h b/content/common/view_messages.h
index b2626e6..fa0ef4a 100644
--- a/content/common/view_messages.h
+++ b/content/common/view_messages.h
@@ -1235,6 +1235,10 @@ IPC_MESSAGE_ROUTED2(ViewHostMsg_ScriptEvalResponse,
                     int  /* id */,
                     ListValue  /* result */)
 
+// Sent by the renderer process to acknowledge receipt of a
+// ViewMsg_CSSInsertRequest message and css has been inserted into the frame.
+IPC_MESSAGE_ROUTED0(ViewHostMsg_OnCSSInserted)
+
 // Result of string search in the page.
 // Response to ViewMsg_Find with the results of the requested find-in-page
 // search, the number of matches found and the selection rect (in screen
diff --git a/content/renderer/render_view.cc b/content/renderer/render_view.cc
index 4d22f54..07acef3 100644
--- a/content/renderer/render_view.cc
+++ b/content/renderer/render_view.cc
@@ -30,11 +30,11 @@
 #include "chrome/common/devtools_messages.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
+#include "chrome/common/extensions/extension_messages.h"
 #include "chrome/common/extensions/extension_set.h"
 #include "chrome/common/json_value_serializer.h"
 #include "chrome/common/pepper_plugin_registry.h"
 #include "chrome/common/render_messages.h"
-#include "chrome/common/render_messages_params.h"
 #include "chrome/common/render_view_commands.h"
 #include "chrome/common/spellcheck_messages.h"
 #include "chrome/common/thumbnail_score.h"
@@ -50,6 +50,7 @@
 #include "chrome/renderer/extension_groups.h"
 #include "chrome/renderer/extensions/bindings_utils.h"
 #include "chrome/renderer/extensions/event_bindings.h"
+#include "chrome/renderer/extensions/extension_helper.h"
 #include "chrome/renderer/extensions/extension_process_bindings.h"
 #include "chrome/renderer/extensions/extension_resource_request_policy.h"
 #include "chrome/renderer/extensions/renderer_extension_bindings.h"
@@ -647,6 +648,8 @@ RenderView::RenderView(RenderThreadBase* render_thread,
 
   // Observer for Malware DOM details messages.
   new safe_browsing::MalwareDOMDetails(this);
+
+  new ExtensionHelper(this);
 }
 
 RenderView::~RenderView() {
@@ -856,7 +859,7 @@ void RenderView::DidDownloadApplicationDefinition(
               NewCallback(this, &RenderView::DidDownloadApplicationIcon))));
     }
   } else {
-    Send(new ViewHostMsg_InstallApplication(routing_id_, *app_info));
+    Send(new ExtensionHostMsg_InstallApplication(routing_id_, *app_info));
   }
 }
 
@@ -905,7 +908,8 @@ void RenderView::DidDownloadApplicationIcon(ImageResourceFetcher* fetcher,
     actual_icon_size += current_size;
   }
 
-  Send(new ViewHostMsg_InstallApplication(routing_id_, *pending_app_info_));
+  Send(new ExtensionHostMsg_InstallApplication(
+      routing_id_, *pending_app_info_));
   pending_app_info_.reset(NULL);
 }
 
@@ -1028,7 +1032,7 @@ bool RenderView::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(
         ViewMsg_GetSerializedHtmlDataForCurrentPageWithLocalLinks,
         OnGetSerializedHtmlDataForCurrentPageWithLocalLinks)
-    IPC_MESSAGE_HANDLER(ViewMsg_GetApplicationInfo, OnGetApplicationInfo)
+    IPC_MESSAGE_HANDLER(ExtensionMsg_GetApplicationInfo, OnGetApplicationInfo)
     IPC_MESSAGE_HANDLER(ViewMsg_ShouldClose, OnShouldClose)
     IPC_MESSAGE_HANDLER(ViewMsg_ClosePage, OnClosePage)
     IPC_MESSAGE_HANDLER(ViewMsg_ThemeChanged, OnThemeChanged)
@@ -1039,9 +1043,6 @@ bool RenderView::OnMessageReceived(const IPC::Message& message) {
     IPC_MESSAGE_HANDLER(ViewMsg_AllowScriptToClose,
                         OnAllowScriptToClose)
     IPC_MESSAGE_HANDLER(ViewMsg_MoveOrResizeStarted, OnMoveOrResizeStarted)
-    IPC_MESSAGE_HANDLER(ViewMsg_ExtensionResponse, OnExtensionResponse)
-    IPC_MESSAGE_HANDLER(ViewMsg_ExtensionMessageInvoke,
-                        OnExtensionMessageInvoke)
     IPC_MESSAGE_HANDLER(ViewMsg_ClearFocusedNode, OnClearFocusedNode)
     IPC_MESSAGE_HANDLER(ViewMsg_SetBackground, OnSetBackground)
     IPC_MESSAGE_HANDLER(ViewMsg_EnablePreferredSizeChangedMode,
@@ -1063,8 +1064,7 @@ bool RenderView::OnMessageReceived(const IPC::Message& message) {
 #endif
     IPC_MESSAGE_HANDLER(ViewMsg_SetEditCommandsForNextKeyEvent,
                         OnSetEditCommandsForNextKeyEvent)
-    IPC_MESSAGE_HANDLER(ViewMsg_ExecuteCode,
-                        OnExecuteCode)
+    IPC_MESSAGE_HANDLER(ExtensionMsg_ExecuteCode, OnExecuteCode)
     IPC_MESSAGE_HANDLER(ViewMsg_CustomContextMenuAction,
                         OnCustomContextMenuAction)
     IPC_MESSAGE_HANDLER(ViewMsg_EnableAccessibility, OnEnableAccessibility)
@@ -3370,7 +3370,7 @@ void RenderView::OnUserScriptIdleTriggered(WebFrame* frame) {
   WebFrame* main_frame = webview()->mainFrame();
   if (frame == main_frame) {
     while (!pending_code_execution_queue_.empty()) {
-      linked_ptr<ViewMsg_ExecuteCode_Params>& params =
+      linked_ptr<ExtensionMsg_ExecuteCode_Params>& params =
           pending_code_execution_queue_.front();
       ExecuteCodeImpl(main_frame, *params);
       pending_code_execution_queue_.pop();
@@ -3905,7 +3905,8 @@ void RenderView::OnGetApplicationInfo(int page_id) {
     }
   }
 
-  Send(new ViewHostMsg_DidGetApplicationInfo(routing_id_, page_id, app_info));
+  Send(new ExtensionHostMsg_DidGetApplicationInfo(
+      routing_id_, page_id, app_info));
 }
 
 GURL RenderView::GetAlternateErrorPageURL(const GURL& failed_url,
@@ -4893,27 +4894,6 @@ void RenderView::OnPluginImeCompositionCompleted(const string16& text,
 }
 #endif  // OS_MACOSX
 
-void RenderView::SendExtensionRequest(
-    const ViewHostMsg_DomMessage_Params& params) {
-  Send(new ViewHostMsg_ExtensionRequest(routing_id_, params));
-}
-
-void RenderView::OnExtensionResponse(int request_id,
-                                     bool success,
-                                     const std::string& response,
-                                     const std::string& error) {
-  ExtensionProcessBindings::HandleResponse(
-      request_id, success, response, error);
-}
-
-void RenderView::OnExtensionMessageInvoke(const std::string& extension_id,
-                                          const std::string& function_name,
-                                          const ListValue& args,
-                                          const GURL& event_url) {
-  RendererExtensionBindings::Invoke(
-      extension_id, function_name, args, this, event_url);
-}
-
 void RenderView::postAccessibilityNotification(
     const WebAccessibilityObject& obj,
     WebAccessibilityNotification notification) {
@@ -4982,7 +4962,7 @@ void RenderView::OnSetEditCommandsForNextKeyEvent(
   edit_commands_ = edit_commands;
 }
 
-void RenderView::OnExecuteCode(const ViewMsg_ExecuteCode_Params& params) {
+void RenderView::OnExecuteCode(const ExtensionMsg_ExecuteCode_Params& params) {
   WebFrame* main_frame = webview() ? webview()->mainFrame() : NULL;
   if (!main_frame) {
     Send(new ViewHostMsg_ExecuteCodeFinished(routing_id_, params.request_id,
@@ -4994,16 +4974,16 @@ void RenderView::OnExecuteCode(const ViewMsg_ExecuteCode_Params& params) {
   NavigationState* navigation_state = NavigationState::FromDataSource(ds);
   if (!navigation_state->user_script_idle_scheduler()->has_run()) {
     pending_code_execution_queue_.push(
-        linked_ptr<ViewMsg_ExecuteCode_Params>(
-            new ViewMsg_ExecuteCode_Params(params)));
+        linked_ptr<ExtensionMsg_ExecuteCode_Params>(
+            new ExtensionMsg_ExecuteCode_Params(params)));
     return;
   }
 
   ExecuteCodeImpl(main_frame, params);
 }
 
-void RenderView::ExecuteCodeImpl(WebFrame* frame,
-                                 const ViewMsg_ExecuteCode_Params& params) {
+void RenderView::ExecuteCodeImpl(
+    WebFrame* frame, const ExtensionMsg_ExecuteCode_Params& params) {
   std::vector<WebFrame*> frame_vector;
   frame_vector.push_back(frame);
   if (params.all_frames)
diff --git a/content/renderer/render_view.h b/content/renderer/render_view.h
index a4af2fb..05c64c2 100644
--- a/content/renderer/render_view.h
+++ b/content/renderer/render_view.h
@@ -63,7 +63,6 @@ class ExternalPopupMenu;
 class FilePath;
 class GeolocationDispatcher;
 class GURL;
-class ListValue;
 class LoadProgressTracker;
 class NavigationState;
 class NotificationProvider;
@@ -80,14 +79,13 @@ class WebPluginDelegatePepper;
 class WebPluginDelegateProxy;
 class WebUIBindings;
 struct ContextMenuMediaParams;
+struct ExtensionMsg_ExecuteCode_Params;
 struct PP_Flash_NetAddress;
 struct ThumbnailScore;
-struct ViewHostMsg_DomMessage_Params;
 struct ViewHostMsg_GetSearchProviderInstallState_Params;
 struct ViewHostMsg_PageHasOSDD_Type;
 struct ViewHostMsg_RunFileChooser_Params;
 struct ViewMsg_ClosePage_Params;
-struct ViewMsg_ExecuteCode_Params;
 struct ViewMsg_Navigate_Params;
 struct ViewMsg_StopFinding_Params;
 struct WebApplicationInfo;
@@ -311,16 +309,9 @@ class RenderView : public RenderWidget,
 
   // Extensions ----------------------------------------------------------------
 
-  void SendExtensionRequest(const ViewHostMsg_DomMessage_Params& params);
-
-  void OnExtensionResponse(int request_id, bool success,
-                           const std::string& response,
-                           const std::string& error);
-
-  void OnSetExtensionViewMode(const std::string& mode);
-
   // Called when the "idle" user script state has been reached. See
   // UserScript::DOCUMENT_IDLE.
+  // TODO(jam): remove me
   void OnUserScriptIdleTriggered(WebKit::WebFrame* frame);
 
   // Plugin-related functions --------------------------------------------------
@@ -847,12 +838,8 @@ class RenderView : public RenderWidget,
                             WebKit::WebDragOperationsMask operations_allowed);
   void OnEnablePreferredSizeChangedMode(int flags);
   void OnEnableViewSourceMode();
-  void OnExecuteCode(const ViewMsg_ExecuteCode_Params& params);
+  void OnExecuteCode(const ExtensionMsg_ExecuteCode_Params& params);
   void OnExecuteEditCommand(const std::string& name, const std::string& value);
-  void OnExtensionMessageInvoke(const std::string& extension_id,
-                                const std::string& function_name,
-                                const ListValue& args,
-                                const GURL& event_url);
   void OnFileChooserResponse(const std::vector<FilePath>& paths);
   void OnFind(int request_id, const string16&, const WebKit::WebFindOptions&);
   void OnFindReplyAck();
@@ -1002,7 +989,7 @@ class RenderView : public RenderWidget,
   // Backend for the IPC Message ExecuteCode in addition to being used
   // internally by other RenderView functions.
   void ExecuteCodeImpl(WebKit::WebFrame* frame,
-                       const ViewMsg_ExecuteCode_Params& params);
+                       const ExtensionMsg_ExecuteCode_Params& params);
 
   // Get all child frames of parent_frame, returned by frames_vector.
   bool GetAllChildFrames(WebKit::WebFrame* parent_frame,
@@ -1352,7 +1339,7 @@ class RenderView : public RenderWidget,
   struct PendingFileChooser;
   std::deque< linked_ptr<PendingFileChooser> > file_chooser_completions_;
 
-  std::queue<linked_ptr<ViewMsg_ExecuteCode_Params> >
+  std::queue<linked_ptr<ExtensionMsg_ExecuteCode_Params> >
       pending_code_execution_queue_;
 
   // ImageResourceFetchers schedule via DownloadImage.