From d6b3961ca2f12484e46c420f0a7634c7b1909935 Mon Sep 17 00:00:00 2001 From: "sergeyu@chromium.org" Date: Fri, 8 Mar 2013 02:33:13 +0000 Subject: 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 --- chrome/renderer/resources/extensions/miscellaneous_bindings.js | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'chrome/renderer/resources/extensions/miscellaneous_bindings.js') 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); -- cgit v1.1