It2Me native messaging: GYP and source refactoring

remoting/webapp/host_native_messaging.js

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 /**
  * @fileoverview
  * Class to communicate with the Host components via Native Messaging.
  */
 
 'use strict';
@@ skipping 11 matching lines @@
    */
   this.nextId_ = 0;
 
   /**
    * @type {Object.<number, remoting.HostNativeMessaging.PendingReply>}
    * @private
    */
   this.pendingReplies_ = {};
 
   /** @type {?chrome.extension.Port} @private */
-  this.port_ = null;
+  this.me2mePort_ = null;

[Sergey Ulanov, 2013/10/30 22:51:01]

I don't think you really need this change. It's better to keep
HostNativeMessaging dedicated to the me2me native messaging and add a spearate
class for it2me. The plugin is currently is instantiated separately for It2Me
and Me2Me. HostDispatcher which creates HostNativeMessaging is used only in
Me2Me case.
You will need to change host_session.js to abstract the plugin and use native
messaging when it's available.

 
   /** @type {string} @private */
   this.version_ = '';
 
   /** @type {Array.<remoting.HostController.Feature>} @private */
   this.supportedFeatures_ = [];
 };
 
 /**
  * Type used for entries of |pendingReplies_| list.
@@ skipping 32 matching lines @@
   // onDisconnect in the case where the Host components are not installed. Need
   // to blacklist these versions of Chrome.
   var majorVersion = navigator.appVersion.match('Chrome/(\\d+)\.')[1];
   if (!majorVersion || majorVersion <= 26) {
     console.log('Native Messaging not supported on this version of Chrome');
     onError(remoting.Error.UNEXPECTED);
     return;
   }
 
   try {
-    this.port_ = chrome.runtime.connectNative(
+    this.me2mePort_ = chrome.runtime.connectNative(
         'com.google.chrome.remote_desktop');
-    this.port_.onMessage.addListener(this.onIncomingMessage_.bind(this));
-    this.port_.onDisconnect.addListener(this.onDisconnect_.bind(this));
+    this.me2mePort_.onMessage.addListener(this.onIncomingMessage_.bind(this));
+    this.me2mePort_.onDisconnect.addListener(this.onDisconnect_.bind(this));
     this.postMessage_({type: 'hello'}, onDone,
                       onError.bind(null, remoting.Error.UNEXPECTED));
   } catch (err) {
     console.log('Native Messaging initialization failed: ',
                 /** @type {*} */ (err));
     onError(remoting.Error.UNEXPECTED);
     return;
   }
 };
 
@@ skipping 71 matching lines @@
  *     on error.
  * @return {void} Nothing.
  * @private
  */
 remoting.HostNativeMessaging.prototype.postMessage_ =
     function(message, onDone, onError) {
   var id = this.nextId_++;
   message['id'] = id;
   this.pendingReplies_[id] = new remoting.HostNativeMessaging.PendingReply(
     message.type + 'Response', onDone, onError);
-  this.port_.postMessage(message);
+  this.me2mePort_.postMessage(message);
 };
 
 /**
  * Handler for incoming Native Messages.
  *
  * @param {Object} message The received message.
  * @return {void} Nothing.
  * @private
  */
 remoting.HostNativeMessaging.prototype.onIncomingMessage_ = function(message) {
@@ skipping 414 matching lines @@
  *     on error.
  * @return {void} Nothing.
  */
 remoting.HostNativeMessaging.prototype.getCredentialsFromAuthCode =
     function(authorizationCode, onDone, onError) {
   this.postMessage_({
     type: 'getCredentialsFromAuthCode',
     authorizationCode: authorizationCode
   }, onDone, onError);
 };