diff options
| author | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 18:04:02 +0000 |
|---|---|---|
| committer | mpcomplete@chromium.org <mpcomplete@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 18:04:02 +0000 |
| commit | 24b74f28711d41a403438b845c6835aefb2c4f93 (patch) | |
| tree | 0405e4506e1dfe1fa46b584caab3aa427e4652ff /chrome/renderer/resources/extensions/extension_custom_bindings.js | |
| parent | 7cac526e260a4b0d5a426e9326c5b06ca76951bc (diff) | |
| download | chromium_src-24b74f28711d41a403438b845c6835aefb2c4f93.zip chromium_src-24b74f28711d41a403438b845c6835aefb2c4f93.tar.gz chromium_src-24b74f28711d41a403438b845c6835aefb2c4f93.tar.bz2 | |
Revert 156678 - Native messaging now uses the MessageService back-end.
Reason: Regression in a ChromeOS extension causing it to continue running after
unloading.
BUG=142915
Review URL: https://codereview.chromium.org/10818013
TBR=eaugusti@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158830 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/resources/extensions/extension_custom_bindings.js')
| -rw-r--r-- | chrome/renderer/resources/extensions/extension_custom_bindings.js | 44 |
1 files changed, 1 insertions, 43 deletions
diff --git a/chrome/renderer/resources/extensions/extension_custom_bindings.js b/chrome/renderer/resources/extensions/extension_custom_bindings.js index 551e103..be19e9c 100644 --- a/chrome/renderer/resources/extensions/extension_custom_bindings.js +++ b/chrome/renderer/resources/extensions/extension_custom_bindings.js @@ -7,7 +7,6 @@ var extensionNatives = requireNative('extension'); var GetExtensionViews = extensionNatives.GetExtensionViews; var OpenChannelToExtension = extensionNatives.OpenChannelToExtension; -var OpenChannelToNativeApp = extensionNatives.OpenChannelToNativeApp; var chromeHidden = requireNative('chrome_hidden').GetChromeHidden(); @@ -94,8 +93,6 @@ chromeHidden.registerCustomHook('extension', sendMessageUpdateArguments.bind(null, 'sendRequest')); apiFunctions.setUpdateArgumentsPreValidate('sendMessage', sendMessageUpdateArguments.bind(null, 'sendMessage')); - apiFunctions.setUpdateArgumentsPreValidate('sendNativeMessage', - sendMessageUpdateArguments.bind(null, 'sendNativeMessage')); apiFunctions.setHandleRequest('sendRequest', function(targetId, request, responseCallback) { @@ -111,13 +108,6 @@ chromeHidden.registerCustomHook('extension', chromeHidden.Port.sendMessageImpl(port, message, responseCallback); }); - apiFunctions.setHandleRequest('sendNativeMessage', - function(targetId, message, responseCallback) { - var port = chrome.extension.connectNative( - targetId, message, chromeHidden.kNativeMessageChannel); - chromeHidden.Port.sendMessageImpl(port, '', responseCallback); - }); - apiFunctions.setUpdateArgumentsPreValidate('connect', function() { // Align missing (optional) function arguments with the arguments that // schema validation is expecting, e.g. @@ -136,29 +126,10 @@ chromeHidden.registerCustomHook('extension', connectInfo = arguments[nextArg++]; if (nextArg != arguments.length) - throw new Error('Invalid arguments to connect.'); + throw new Error('Invalid arguments to connect'); return [targetId, connectInfo]; }); - apiFunctions.setUpdateArgumentsPreValidate('connectNative', function() { - var nextArg = 0; - - // appName is required. - var appName = arguments[nextArg++]; - - // connectionMessage is required. - var connectMessage = arguments[nextArg++]; - - // channelName is only passed by sendMessage - var channelName = 'connectNative'; - if (typeof(arguments[nextArg]) == 'string') - channelName = arguments[nextArg++]; - - if (nextArg != arguments.length) - throw new Error('Invalid arguments to connectNative.'); - return [appName, {name: channelName, message: connectMessage}]; - }); - apiFunctions.setHandleRequest('connect', function(targetId, connectInfo) { if (!targetId) targetId = extensionId; @@ -171,17 +142,4 @@ chromeHidden.registerCustomHook('extension', return chromeHidden.Port.createPort(portId, name); throw new Error('Error connecting to extension ' + targetId); }); - - apiFunctions.setHandleRequest('connectNative', - function(nativeAppName, connectInfo) { - // Turn the object into a string here, because it eventually will be. - var portId = OpenChannelToNativeApp(extensionId, - nativeAppName, - connectInfo.name, - JSON.stringify(connectInfo.message)); - if (portId >= 0) { - return chromeHidden.Port.createPort(portId, connectInfo.name); - } - throw new Error('Error connecting to native app: ' + nativeAppName); - }); }); |