Add a port disconnect event for when one side of an extension message port

goes away.

Combine the various ExtensionMessageService IPC message into a single "Invoke"
message.

BUG=12686
TEST=no
Review URL: http://codereview.chromium.org/126234

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

1 files changed, 5 insertions, 19 deletions

diff --git a/chrome/renderer/render_thread.cc b/chrome/renderer/render_thread.cc
index e615a49..e4905982 100644
--- a/chrome/renderer/render_thread.cc
+++ b/chrome/renderer/render_thread.cc
@@ -226,12 +226,8 @@ void RenderThread::OnControlMessageReceived(const IPC::Message& msg) {
                         OnUpdateUserScripts)
     // TODO(rafaelw): create an ExtensionDispatcher that handles extension
     // messages seperates their handling from the RenderThread.
-    IPC_MESSAGE_HANDLER(ViewMsg_ExtensionHandleConnect,
-                        OnExtensionHandleConnect)
-    IPC_MESSAGE_HANDLER(ViewMsg_ExtensionHandleMessage,
-                        OnExtensionHandleMessage)
-    IPC_MESSAGE_HANDLER(ViewMsg_ExtensionHandleEvent,
-                        OnExtensionHandleEvent)
+    IPC_MESSAGE_HANDLER(ViewMsg_ExtensionMessageInvoke,
+                        OnExtensionMessageInvoke)
     IPC_MESSAGE_HANDLER(ViewMsg_Extension_SetFunctionNames,
                         OnSetExtensionFunctionNames)
     IPC_MESSAGE_HANDLER(ViewMsg_PurgePluginListCache,
@@ -382,19 +378,9 @@ void RenderThread::EnsureWebKitInitialized() {
     WebKit::enableMediaPlayer();
 }
 
-void RenderThread::OnExtensionHandleConnect(int port_id,
-                                            const std::string& tab_json) {
-  RendererExtensionBindings::HandleConnect(port_id, tab_json);
-}
-
-void RenderThread::OnExtensionHandleMessage(const std::string& message,
-                                            int port_id) {
-  RendererExtensionBindings::HandleMessage(message, port_id);
-}
-
-void RenderThread::OnExtensionHandleEvent(const std::string event_name,
-                                          const std::string event_data) {
-  RendererExtensionBindings::HandleEvent(event_name, event_data);
+void RenderThread::OnExtensionMessageInvoke(const std::string& function_name,
+                                            const ListValue& args) {
+  RendererExtensionBindings::Invoke(function_name, args);
 }
 
 void RenderThread::OnPurgePluginListCache() {