diff options
author | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-08 02:33:13 +0000 |
---|---|---|
committer | sergeyu@chromium.org <sergeyu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-08 02:33:13 +0000 |
commit | d6b3961ca2f12484e46c420f0a7634c7b1909935 (patch) | |
tree | 5bbc6528e4aeb5499e5befc77a21723ed86841e3 /chrome/renderer/resources/extensions/miscellaneous_bindings.js | |
parent | 4bafe67515e2a6db243f6547a5e51f5c7a330844 (diff) | |
download | chromium_src-d6b3961ca2f12484e46c420f0a7634c7b1909935.zip chromium_src-d6b3961ca2f12484e46c420f0a7634c7b1909935.tar.gz chromium_src-d6b3961ca2f12484e46c420f0a7634c7b1909935.tar.bz2 |
Set correct error message when disconnecting messaging port.
Previously the same error message was used for all messaging-releated errors.
That's a problem for native messaging because there may be different reasons
for the error. Modified IPC messages to pass error message string instead of
a single boolean flag for errors.
BUG=142915
Review URL: https://codereview.chromium.org/12480008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186861 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/renderer/resources/extensions/miscellaneous_bindings.js')
-rw-r--r-- | chrome/renderer/resources/extensions/miscellaneous_bindings.js | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/chrome/renderer/resources/extensions/miscellaneous_bindings.js b/chrome/renderer/resources/extensions/miscellaneous_bindings.js index 147528c..fc8e2cc 100644 --- a/chrome/renderer/resources/extensions/miscellaneous_bindings.js +++ b/chrome/renderer/resources/extensions/miscellaneous_bindings.js @@ -225,16 +225,14 @@ // Called by native code when a channel has been closed. chromeHidden.Port.dispatchOnDisconnect = function( - portId, connectionInvalid) { + portId, errorMessage) { var port = ports[portId]; if (port) { // Update the renderer's port bookkeeping, without notifying the browser. CloseChannel(portId, false); - if (connectionInvalid) { - var errorMsg = - "Could not establish connection. Receiving end does not exist."; - lastError.set(errorMsg); - console.error("Port error: " + errorMsg); + if (errorMessage) { + lastError.set(errorMessage); + console.error("Port error: " + errorMessage); } try { port.onDisconnect.dispatch(port); |