Add an optional channel name to the extension message connect event.

Also changed the way port IDs work internally to reduce confusion.  Each end of the port has its own ID, not the ID of its opposite end.

BUG=13706
TEST=no

Review URL: http://codereview.chromium.org/155381

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

2 files changed, 20 insertions, 8 deletions

diff --git a/chrome/renderer/resources/extension_process_bindings.js b/chrome/renderer/resources/extension_process_bindings.js
index 51756d0..1c8fc9c4 100644
--- a/chrome/renderer/resources/extension_process_bindings.js
+++ b/chrome/renderer/resources/extension_process_bindings.js
@@ -7,6 +7,9 @@
 // have your change take effect.
 // -----------------------------------------------------------------------------
 
+// This script contains privileged chrome extension related javascript APIs.
+// It is loaded by pages whose URL has the chrome-extension protocol.
+
 var chrome = chrome || {};
 (function() {
   native function GetViews();
diff --git a/chrome/renderer/resources/renderer_extension_bindings.js b/chrome/renderer/resources/renderer_extension_bindings.js
index 2a41d5f..d8b5a4b 100644
--- a/chrome/renderer/resources/renderer_extension_bindings.js
+++ b/chrome/renderer/resources/renderer_extension_bindings.js
@@ -7,6 +7,13 @@
 // have your change take effect.
 // -----------------------------------------------------------------------------
 
+// This script contains unprivileged javascript APIs related to chrome
+// extensions.  It is loaded by any extension-related context, such as content
+// scripts or toolstrips.
+// See user_script_slave.cc for script that is loaded by content scripts only.
+// TODO(mpcomplete): we also load this in regular web pages, but don't need
+// to.
+
 var chrome = chrome || {};
 (function () {
   native function OpenChannelToExtension(id);
@@ -21,8 +28,9 @@ var chrome = chrome || {};
 
   // Port object.  Represents a connection to another script context through
   // which messages can be passed.
-  chrome.Port = function(portId) {
+  chrome.Port = function(portId, opt_name) {
     this.portId_ = portId;
+    this.name = opt_name;
     this.onDisconnect = new chrome.Event();
     this.onMessage = new chrome.Event();
   };
@@ -31,11 +39,11 @@ var chrome = chrome || {};
 
   // Hidden port creation function.  We don't want to expose an API that lets
   // people add arbitrary port IDs to the port list.
-  chromeHidden.Port.createPort = function(portId) {
+  chromeHidden.Port.createPort = function(portId, opt_name) {
     if (ports[portId]) {
       throw new Error("Port '" + portId + "' already exists.");
     }
-    var port = new chrome.Port(portId);
+    var port = new chrome.Port(portId, opt_name);
     ports[portId] = port;
     chromeHidden.onUnload.addListener(function() {
       port.disconnect();
@@ -44,14 +52,15 @@ var chrome = chrome || {};
   }
 
   // Called by native code when a channel has been opened to this context.
-  chromeHidden.Port.dispatchOnConnect = function(portId, tab, extensionId) {
+  chromeHidden.Port.dispatchOnConnect = function(portId, channelName, tab,
+                                                 extensionId) {
     // Only create a new Port if someone is actually listening for a connection.
     // In addition to being an optimization, this also fixes a bug where if 2
     // channels were opened to and from the same process, closing one would
     // close both.
     var connectEvent = "channel-connect:" + extensionId;
     if (chromeHidden.Event.hasListener(connectEvent)) {
-      var port = chromeHidden.Port.createPort(portId);
+      var port = chromeHidden.Port.createPort(portId, channelName);
       if (tab) {
         tab = JSON.parse(tab);
       }
@@ -103,11 +112,11 @@ var chrome = chrome || {};
 
   // Opens a message channel to the extension.  Returns a Port for
   // message passing.
-  chrome.Extension.prototype.connect = function() {
-    var portId = OpenChannelToExtension(this.id_);
+  chrome.Extension.prototype.connect = function(opt_name) {
+    var portId = OpenChannelToExtension(this.id_, opt_name || "");
     if (portId == -1)
       throw new Error("No such extension: '" + this.id_ + "'");
-    return chromeHidden.Port.createPort(portId);
+    return chromeHidden.Port.createPort(portId, opt_name);
   };
 
   // Returns a resource URL that can be used to fetch a resource from this