Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(111)

Unified Diff: remoting/webapp/crd/js/host_daemon_facade.js

Issue 803653004: Update Chromoting to use /third_party/closure_compiler. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: remoting/webapp/crd/js/host_daemon_facade.js
diff --git a/remoting/webapp/crd/js/host_daemon_facade.js b/remoting/webapp/crd/js/host_daemon_facade.js
index f77504408f42f884810283670457f2b973cdfa70..de5e335e1acbe8753111e60cb78ba436c7846c37 100644
--- a/remoting/webapp/crd/js/host_daemon_facade.js
+++ b/remoting/webapp/crd/js/host_daemon_facade.js
@@ -91,26 +91,25 @@ remoting.HostDaemonFacade.prototype.initialize_ = function() {
* @private
*/
remoting.HostDaemonFacade.prototype.connectNative_ = function() {
- return new Promise(
- /**
- * @param {function(*=):void} resolve
- * @param {function(*=):void} reject
- * @this {remoting.HostDaemonFacade}
- */
- function(resolve, reject) {
- try {
- this.port_ = chrome.runtime.connectNative(
- 'com.google.chrome.remote_desktop');
- this.port_.onMessage.addListener(this.onIncomingMessageCallback_);
- this.port_.onDisconnect.addListener(this.onDisconnectCallback_);
- this.postMessageInternal_({type: 'hello'}, resolve, reject);
- } catch (err) {
- console.log('Native Messaging initialization failed: ',
- /** @type {*} */ (err));
- reject();
- }
- }.bind(this)
- );
+ /**
+ * @this {remoting.HostDaemonFacade}
+ * @param {function(?):void} resolve
+ * @param {function(*):void} reject
+ */
+ var connect = function(resolve, reject) {
+ try {
+ this.port_ = chrome.runtime.connectNative(
+ 'com.google.chrome.remote_desktop');
+ this.port_.onMessage.addListener(this.onIncomingMessageCallback_);
+ this.port_.onDisconnect.addListener(this.onDisconnectCallback_);
+ this.postMessageInternal_({type: 'hello'}, resolve, reject);
+ } catch (/** @type {*} */ err) {
+ console.log('Native Messaging initialization failed: ', err);
+ reject(false);
+ }
+ };
+
+ return new Promise(connect.bind(this));
};
/**
@@ -213,9 +212,8 @@ remoting.HostDaemonFacade.prototype.onIncomingMessage_ = function(message) {
}
this.handleIncomingMessage_(message, reply.onDone);
- } catch (e) {
- console.error('Error while processing native message' +
- /** @type {*} */ (e));
+ } catch (/** @type {*} */ e) {
+ console.error('Error while processing native message' + e);
reply.onError(remoting.Error.UNEXPECTED);
}
}
@@ -340,7 +338,8 @@ remoting.HostDaemonFacade.prototype.onDisconnect_ = function() {
var pendingReplies = this.pendingReplies_;
this.pendingReplies_ = {};
for (var id in pendingReplies) {
- pendingReplies[/** @type {number} */(id)].onError(this.error_);
+ var num_id = parseInt(id, 10);
+ pendingReplies[num_id].onError(this.error_);
}
}

Powered by Google App Engine
This is Rietveld 408576698