1 files changed, 8 insertions, 3 deletions
diff --git a/chrome/browser/extensions/extension_host.h b/chrome/browser/extensions/extension_host.h
index 1601a8c..9dcfb7f 100644
--- a/chrome/browser/extensions/extension_host.h
+++ b/chrome/browser/extensions/extension_host.h
@@ -29,6 +29,7 @@ class Browser;
 class DesktopNotificationHandler;
 class DevToolsHandler;
 class Extension;
+class ExtensionMessageHandler;
 class FileSelectHelper;
 class RenderProcessHost;
 class RenderWidgetHostView;
@@ -130,8 +131,6 @@ class ExtensionHost : public RenderViewHostDelegate,
   // RenderViewHostDelegate implementation.
   virtual RenderViewHostDelegate::View* GetViewDelegate();
   virtual WebPreferences GetWebkitPrefs();
-  virtual void ProcessWebUIMessage(
-      const ExtensionHostMsg_DomMessage_Params& params);
   virtual void RunJavaScriptMessage(const std::wstring& message,
                                     const std::wstring& default_prompt,
                                     const GURL& frame_url,
@@ -232,13 +231,16 @@ class ExtensionHost : public RenderViewHostDelegate,
 
   // Message handlers.
   void OnRunFileChooser(const ViewHostMsg_RunFileChooser_Params& params);
-  void OnPostMessage(int port_id, const std::string& message);
 
   // Handles keyboard events that were not handled by HandleKeyboardEvent().
   // Platform specific implementation may override this method to handle the
   // event in platform specific way.
   virtual void UnhandledKeyboardEvent(const NativeWebKeyboardEvent& event) {}
 
+  // Updates extension_function_dispatcher_.  Call this instead of modifying it
+  // directly.
+  void SetExtensionFunctionDispatcher(ExtensionFunctionDispatcher* efd);
+
   // Returns true if we're hosting a background page.
   // This isn't valid until CreateRenderView is called.
   bool is_background_page() const { return !view(); }
@@ -296,6 +298,9 @@ class ExtensionHost : public RenderViewHostDelegate,
   // Filters dev tools IPCs.
   scoped_ptr<DevToolsHandler> dev_tools_handler_;
 
+  // Handles extension IPCs.
+  scoped_ptr<ExtensionMessageHandler> extension_message_handler_;
+
   // The time that the last javascript message was dismissed.
   base::TimeTicks last_javascript_message_dismissal_;