Implement chrome.extension.connectExternal and fix various API inconsistencies.

chrome/browser/extensions/extension_message_service.h

 // Copyright (c) 2009 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_MESSAGE_SERVICE_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_MESSAGE_SERVICE_H_
 
 #include <map>
 #include <set>
 #include <string>
@@ skipping 96 matching lines @@
       TabContents* target_tab_contents, IPC::Message::Sender* source);
 
   // --- IO thread only:
 
   // Given an extension's ID, opens a channel between the given renderer "port"
   // and every listening context owned by that extension.  Returns a port ID
   // to be used for posting messages between the processes.  |channel_name| is
   // an optional identifier for use by extension developers.
   // This runs on the IO thread so that it can be used in a synchronous IPC
   // message.
-  int OpenChannelToExtension(int routing_id, const std::string& extension_id,
+  int OpenChannelToExtension(int routing_id,
+                             const std::string& source_extension_id,
+                             const std::string& target_extension_id,
                              const std::string& channel_name,
                              ResourceMessageFilter* source);
 
   // Same as above, but opens a channel to the tab with the given ID.  Messages
   // are restricted to that tab, so if there are multiple tabs in that process,
   // only the targeted tab will receive messages.
   int OpenChannelToTab(int routing_id, int tab_id,
                        const std::string& extension_id,
                        const std::string& channel_name,
                        ResourceMessageFilter* source);
@@ skipping 11 matching lines @@
 
   // The UI message loop, used for posting tasks.
   MessageLoop* ui_loop_;
 
   // --- UI thread only:
 
   // Handles channel creation and notifies the destinations that a channel was
   // opened.
   void OpenChannelToExtensionOnUIThread(
     int source_process_id, int source_routing_id, int receiver_port_id,
-    const std::string& extension_id, const std::string& channel_name);
+    const std::string& source_extension_id,
+    const std::string& target_extension_id,
+    const std::string& channel_name);
 
   void OpenChannelToTabOnUIThread(
     int source_process_id, int source_routing_id, int receiver_port_id,
     int tab_id, const std::string& extension_id,
     const std::string& channel_name);
 
   // Common between OpenChannelOnUIThread and OpenSpecialChannelToExtension.
   bool OpenChannelOnUIThreadImpl(
       IPC::Message::Sender* source, TabContents* source_contents,
       const MessagePort& receiver, int receiver_port_id,
-      const std::string& extension_id, const std::string& channel_name);
+      const std::string& source_extension_id,
+      const std::string& target_extension_id,
+      const std::string& channel_name);
 
   // NotificationObserver interface.
   void Observe(NotificationType type,
                const NotificationSource& source,
                const NotificationDetails& details);
 
   // An IPC sender that might be in our list of channels has closed.
   void OnSenderClosed(IPC::Message::Sender* sender);
 
   Profile* profile_;
@@ skipping 15 matching lines @@
   int next_port_id_;
 
   // Protects the next_port_id_ variable, since it can be
   // used on the IO thread or the UI thread.
   Lock next_port_id_lock_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionMessageService);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_MESSAGE_SERVICE_H_