Remoting webapp: Add onError param to HostNativeMessaging.initialize()

Remoting webapp: Add onError param to HostNativeMessaging.initialize()

This makes the method consistent with the other methods of
HostNativeMessaging, and allows future flexibility to define
error codes, instead of just passing a boolean to onDone().

BUG=249970
TEST=Verify host setup flow, with and without native messaging.

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=213274

[Jamie, 2013-07-20 01:37:31]

LGTM. Sorry for the delay.

[commit-bot: I haz the power, 2013-07-23 21:05:57]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/lambroslambrou@chromium.org/17465007/1

[commit-bot: I haz the power, 2013-07-23 21:05:59]

Failed to apply patch for remoting/webapp/host_native_messaging.js:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file remoting/webapp/host_native_messaging.js
  Hunk #1 FAILED at 56.
  Hunk #2 succeeded at 73 (offset -3 lines).
  Hunk #3 succeeded at 82 (offset -3 lines).
  1 out of 3 hunks FAILED -- saving rejects to file
remoting/webapp/host_native_messaging.js.rej

Patch:       remoting/webapp/host_native_messaging.js
Index: remoting/webapp/host_native_messaging.js
diff --git a/remoting/webapp/host_native_messaging.js
b/remoting/webapp/host_native_messaging.js
index
f9d5ba7d9b207acb636604658e1dc41784a4496a..a66fd02b2d5444a969cb5ab0f34f256bdff270f5
100644
--- a/remoting/webapp/host_native_messaging.js
+++ b/remoting/webapp/host_native_messaging.js
@@ -56,17 +56,18 @@ remoting.HostNativeMessaging.PendingReply = function(type,
callback, onError) {
  * 'hello' messages. If Native Messaging is not available or the host
  * process is not installed, this returns false to the callback.
  *
- * @param {function(boolean): void} onDone Called with the result of
- *     initialization.
+ * @param {function(): void} onDone Called after successful initialization.
+ * @param {function(remoting.Error): void} onError Called if initialization
+ *     failed.
  * @return {void} Nothing.
  */
-remoting.HostNativeMessaging.prototype.initialize = function(onDone) {
+remoting.HostNativeMessaging.prototype.initialize = function(onDone, onError) {
   // TODO(lambroslambrou): Remove 'alwaysTrue ||' once the Chrome Remote
Desktop
   // native messaging API is stable.
   var alwaysTrue = true;
   if (alwaysTrue || !chrome.runtime.connectNative) {
     console.log('Native Messaging API not available');
-    onDone(false);
+    onError(remoting.Error.UNEXPECTED);
     return;
   }
 
@@ -76,7 +77,7 @@ remoting.HostNativeMessaging.prototype.initialize =
function(onDone) {
   var majorVersion = navigator.appVersion.match('Chrome/(\\d+)\.')[1];
   if (!majorVersion || majorVersion <= 26) {
     console.log('Native Messaging not supported on this version of Chrome');
-    onDone(false);
+    onError(remoting.Error.UNEXPECTED);
     return;
   }
 
@@ -85,12 +86,12 @@ remoting.HostNativeMessaging.prototype.initialize =
function(onDone) {
         'com.google.chrome.remote_desktop');
     this.port_.onMessage.addListener(this.onIncomingMessage_.bind(this));
     this.port_.onDisconnect.addListener(this.onDisconnect_.bind(this));
-    this.postMessage_({type: 'hello'}, onDone.bind(null, true),
-                      onDone.bind(null, false));
+    this.postMessage_({type: 'hello'}, onDone,
+                      onError.bind(null, remoting.Error.UNEXPECTED));
   } catch (err) {
     console.log('Native Messaging initialization failed: ',
                 /** @type {*} */ (err));
-    onDone(false);
+    onError(remoting.Error.UNEXPECTED);
     return;
   }
 };

[commit-bot: I haz the power, 2013-07-23 21:13:40]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/lambroslambrou@chromium.org/17465007/6001

[commit-bot: I haz the power, 2013-07-23 23:43:02]

Change committed as 213274