Converted remoting.Error to be a class rather than just a string.

Review URL: https://codereview.chromium.org/955283002

Cr-Commit-Position: refs/heads/master@{#319824}

remoting/webapp/app_remoting/js/app_remoting.js

@@ -181,7 +181,7 @@ remoting.AppRemoting.prototype.start = function(connector, token) {
  * Report an authentication error to the user. This is called in lieu of start()
  * if the user cannot be authenticated or if they decline the app permissions.
  *
- * @param {remoting.Error} error The failure reason.
+ * @param {!remoting.Error} error The failure reason.
  */
 remoting.AppRemoting.prototype.signInFailed = function(error) {
   this.handleError(error);
@@ -252,7 +252,7 @@ remoting.AppRemoting.prototype.handleDisconnected = function() {
  * Called when the current session's connection has failed.
  *
  * @param {remoting.SessionConnector} connector
- * @param {remoting.Error} error
+ * @param {!remoting.Error} error
  * @return {void} Nothing.
  */
 remoting.AppRemoting.prototype.handleConnectionFailed = function(
@@ -328,7 +328,7 @@ remoting.AppRemoting.prototype.handleExtensionMessage = function(
 /**
  * Called when an error needs to be displayed to the user.
  *
- * @param {remoting.Error} errorTag The error to be localized and displayed.
+ * @param {!remoting.Error} errorTag The error to be localized and displayed.
  * @return {void} Nothing.
  */
 remoting.AppRemoting.prototype.handleError = function(errorTag) {

remoting/webapp/app_remoting/js/loading_window.js

@@ -26,7 +26,7 @@ remoting.LoadingWindow = function() {};
 remoting.LoadingWindow.onTimeout_ = function() {
   remoting.MessageWindow.showErrorMessage(
       remoting.app.getApplicationName(),
-      chrome.i18n.getMessage(remoting.Error.SERVICE_UNAVAILABLE));
+      chrome.i18n.getMessage(remoting.Error.Tag.SERVICE_UNAVAILABLE));
 };
 
 /**

remoting/webapp/base/js/application.js

@@ -149,7 +149,7 @@ remoting.Application.prototype.onDisconnected = function() {
 /**
  * Called when the current session's connection has failed.
  *
- * @param {remoting.Error} error
+ * @param {!remoting.Error} error
  * @return {void} Nothing.
  */
 remoting.Application.prototype.onConnectionFailed = function(error) {
@@ -193,7 +193,7 @@ remoting.Application.prototype.onExtensionMessage = function(type, data) {
 /**
  * Called when an error needs to be displayed to the user.
  *
- * @param {remoting.Error} errorTag The error to be localized and displayed.
+ * @param {!remoting.Error} errorTag The error to be localized and displayed.
  * @return {void} Nothing.
  */
 remoting.Application.prototype.onError = function(errorTag) {
@@ -289,7 +289,7 @@ remoting.Application.Delegate.prototype.start = function(connector, token) {};
  * Report an authentication error to the user. This is called in lieu of start()
  * if the user cannot be authenticated.
  *
- * @param {remoting.Error} error The failure reason.
+ * @param {!remoting.Error} error The failure reason.
  */
 remoting.Application.Delegate.prototype.signInFailed = function(error) {};
 
@@ -323,7 +323,7 @@ remoting.Application.Delegate.prototype.handleDisconnected = function() {};
  * Called when the current session's connection has failed.
  *
  * @param {remoting.SessionConnector} connector
- * @param {remoting.Error} error
+ * @param {!remoting.Error} error
  * @return {void} Nothing.
  */
 remoting.Application.Delegate.prototype.handleConnectionFailed =
@@ -351,7 +351,7 @@ remoting.Application.Delegate.prototype.handleExtensionMessage =
 /**
  * Called when an error needs to be displayed to the user.
  *
- * @param {remoting.Error} errorTag The error to be localized and displayed.
+ * @param {!remoting.Error} errorTag The error to be localized and displayed.
  * @return {void} Nothing.
  */
 remoting.Application.Delegate.prototype.handleError = function(errorTag) {};

remoting/webapp/browser_test/browser_test.js

@@ -249,7 +249,7 @@ browserTest.enterPIN = function(pin, opt_expectError) {
     if (opt_expectError) {
       return browserTest.expectConnectionError(
           remoting.DesktopConnectedView.Mode.ME2ME,
-          remoting.Error.INVALID_ACCESS_CODE);
+          remoting.Error.Tag.INVALID_ACCESS_CODE);
     } else {
       return browserTest.expectConnected();
     }

remoting/webapp/browser_test/it2me_browser_test.js

@@ -66,7 +66,7 @@ browserTest.InvalidAccessCode.prototype.run = function(data) {
     browserTest.clickOnControl('connect-button');
     return browserTest.expectConnectionError(
         remoting.DesktopConnectedView.Mode.IT2ME,
-        remoting.Error.INVALID_ACCESS_CODE);
+        remoting.Error.Tag.INVALID_ACCESS_CODE);
   }).then(function() {
     browserTest.pass();
   }, function(/** * */reason) {

remoting/webapp/browser_test/mock_host_list_api.js

@@ -42,7 +42,7 @@ remoting.MockHostListApi = function() {
 
 /**
  * @param {function(Array<remoting.Host>):void} onDone
- * @param {function(remoting.Error):void} onError
+ * @param {function(!remoting.Error):void} onError
  */
 remoting.MockHostListApi.prototype.get = function(onDone, onError) {
   remoting.mockIdentity.validateTokenAndCall(onDone, onError, [this.hosts]);
@@ -53,7 +53,7 @@ remoting.MockHostListApi.prototype.get = function(onDone, onError) {
  * @param {string} hostName
  * @param {string} hostPublicKey
  * @param {function():void} onDone
- * @param {function(remoting.Error):void} onError
+ * @param {function(!remoting.Error):void} onError
  */
 remoting.MockHostListApi.prototype.put =
     function(hostId, hostName, hostPublicKey, onDone, onError) {
@@ -79,7 +79,7 @@ remoting.MockHostListApi.prototype.put =
 /**
  * @param {string} hostId
  * @param {function():void} onDone
- * @param {function(remoting.Error):void} onError
+ * @param {function(!remoting.Error):void} onError
  */
 remoting.MockHostListApi.prototype.remove =
     function(hostId, onDone, onError) {

remoting/webapp/browser_test/mock_identity.js

@@ -68,7 +68,7 @@ remoting.MockIdentity.prototype.setAccessToken = function(accessToken) {
 /**
  * @param {string} token
  * @param {Function} onDone
- * @param {function(remoting.Error)} onError
+ * @param {function(!remoting.Error)} onError
  * @param {Array<*>} values
  */
 remoting.MockIdentity.validateTokenAndCall =
@@ -86,7 +86,7 @@ remoting.MockIdentity.validateTokenAndCall =
 
 /**
  * @param {Function} onDone
- * @param {function(remoting.Error)} onError
+ * @param {function(!remoting.Error)} onError
  * @param {Array<*>} values
  */
 remoting.MockIdentity.prototype.validateTokenAndCall =

remoting/webapp/browser_test/mock_oauth2_api.js

@@ -32,7 +32,7 @@ remoting.MockOAuth2Api = function() {
 
 /**
  * @param {function(string, number): void} onDone
- * @param {function(remoting.Error):void} onError
+ * @param {function(!remoting.Error):void} onError
  * @param {string} clientId
  * @param {string} clientSecret
  * @param {string} refreshToken
@@ -47,7 +47,7 @@ remoting.MockOAuth2Api.prototype.refreshAccessToken = function(
 
 /**
  * @param {function(string, string, number): void} onDone
- * @param {function(remoting.Error):void} onError
+ * @param {function(!remoting.Error):void} onError
  * @param {string} clientId
  * @param {string} clientSecret
  * @param {string} code
@@ -63,7 +63,7 @@ remoting.MockOAuth2Api.prototype.exchangeCodeForTokens = function(
 
 /**
  * @param {function(string,string)} onDone
- * @param {function(remoting.Error)} onError
+ * @param {function(!remoting.Error)} onError
  * @param {string} token
  */
 remoting.MockOAuth2Api.prototype.getEmail = function(onDone, onError, token) {
@@ -73,7 +73,7 @@ remoting.MockOAuth2Api.prototype.getEmail = function(onDone, onError, token) {
 
 /**
  * @param {function(string,string)} onDone
- * @param {function(remoting.Error)} onError
+ * @param {function(!remoting.Error)} onError
  * @param {string} token
  */
 remoting.MockOAuth2Api.prototype.getUserInfo =

remoting/webapp/browser_test/mock_session_connector.js

@@ -17,11 +17,11 @@ var remoting = remoting || {};
  * @param {HTMLElement} clientContainer Container element for the client view.
  * @param {function(remoting.ClientSession):void} onConnected Callback on
  *     success.
- * @param {function(remoting.Error):void} onError Callback on error.
+ * @param {function(!remoting.Error):void} onError Callback on error.
  * @param {function(string, string):boolean} onExtensionMessage The handler for
  *     protocol extension messages. Returns true if a message is recognized;
  *     false otherwise.
- * @param {function(remoting.Error):void} onConnectionFailed Callback for when
+ * @param {function(!remoting.Error):void} onConnectionFailed Callback for when
  *     the connection fails.
  * @param {Array<string>} requiredCapabilities Connector capabilities
  *     required by this application.
@@ -162,11 +162,11 @@ remoting.MockSessionConnectorFactory = function() {};
  * @param {HTMLElement} clientContainer Container element for the client view.
  * @param {function(remoting.ClientSession):void} onConnected Callback on
  *     success.
- * @param {function(remoting.Error):void} onError Callback on error.
+ * @param {function(!remoting.Error):void} onError Callback on error.
  * @param {function(string, string):boolean} onExtensionMessage The handler for
  *     protocol extension messages. Returns true if a message is recognized;
  *     false otherwise.
- * @param {function(remoting.Error):void} onConnectionFailed Callback for when
+ * @param {function(!remoting.Error):void} onConnectionFailed Callback for when
  *     the connection fails.
  * @param {Array<string>} requiredCapabilities Connector capabilities
  *     required by this application.

remoting/webapp/crd/js/client_session.js

@@ -44,7 +44,7 @@ remoting.ClientSession = function(plugin, host, signalStrategy, mode) {
   /** @private */
   this.state_ = remoting.ClientSession.State.CREATED;
 
-  /** @private */
+  /** @private {!remoting.Error} */
   this.error_ = remoting.Error.NONE;
 
   /** @private */
@@ -259,14 +259,14 @@ remoting.ClientSession.prototype.removePlugin = function() {
  * raise a |stateChanged| event in response to it.  The caller should then call
  * dispose() to remove and destroy the <embed> element.
  *
- * @param {remoting.Error} error The reason for the disconnection.  Use
+ * @param {!remoting.Error} error The reason for the disconnection.  Use
  *    remoting.Error.NONE if there is no error.
  * @return {void} Nothing.
  */
 remoting.ClientSession.prototype.disconnect = function(error) {
-  var state = (error == remoting.Error.NONE) ?
-                  remoting.ClientSession.State.CLOSED :
-                  remoting.ClientSession.State.FAILED;
+  var state = error.isError() ?
+                  remoting.ClientSession.State.FAILED :
+                  remoting.ClientSession.State.CLOSED;
 
   // The plugin won't send a state change notification, so we explicitly log
   // the fact that the connection has closed.
@@ -305,7 +305,7 @@ remoting.ClientSession.prototype.getState = function() {
 };
 
 /**
- * @return {remoting.Error} The current error code.
+ * @return {!remoting.Error} The current error code.
  */
 remoting.ClientSession.prototype.getError = function() {
   return this.error_;
@@ -492,7 +492,7 @@ remoting.ClientSession.prototype.setState_ = function(newState) {
     if (this.state_ == remoting.ClientSession.State.CLOSED) {
       state = remoting.ClientSession.State.CONNECTION_CANCELED;
     } else if (this.state_ == remoting.ClientSession.State.FAILED &&
-        this.error_ == remoting.Error.HOST_IS_OFFLINE &&
+        this.error_.tag == remoting.Error.Tag.HOST_IS_OFFLINE &&
         !this.logHostOfflineErrors_) {
       // The application requested host-offline errors to be suppressed, for
       // example, because this connection attempt is using a cached host JID.
@@ -637,7 +637,7 @@ remoting.ClientSession.prototype.sendGoogleDriveAccessToken_ = function() {
   var sendToken = function(token) {
     remoting.clientSession.sendClientMessage('accessToken', token);
   };
-  /** @param {remoting.Error} error */
+  /** @param {!remoting.Error} error */
   var sendError = function(error) {
     console.log('Failed to refresh access token: ' + error);
   };

remoting/webapp/crd/js/crd_main.js

@@ -136,7 +136,7 @@ remoting.updateLocalHostState = function() {
    */
   var onHasFeatureResponse = function(response) {
     /**
-     * @param {remoting.Error} error
+     * @param {!remoting.Error} error
      */
     var onError = function(error) {
       console.error('Failed to get pairing status: ' + error);

remoting/webapp/crd/js/desktop_remoting.js

@@ -137,7 +137,7 @@ remoting.DesktopRemoting.prototype.start = function(connector, token) {
  * Report an authentication error to the user. This is called in lieu of start()
  * if the user cannot be authenticated or if they decline the app permissions.
  *
- * @param {remoting.Error} error The failure reason.
+ * @param {!remoting.Error} error The failure reason.
  */
 remoting.DesktopRemoting.prototype.signInFailed = function(error) {
   remoting.showErrorMessage(error);
@@ -246,7 +246,7 @@ remoting.DesktopRemoting.prototype.handleDisconnected = function() {
  * Called when the current session's connection has failed.
  *
  * @param {remoting.SessionConnector} connector
- * @param {remoting.Error} error
+ * @param {!remoting.Error} error
  * @return {void} Nothing.
  */
 remoting.DesktopRemoting.prototype.handleConnectionFailed = function(
@@ -266,7 +266,7 @@ remoting.DesktopRemoting.prototype.handleConnectionFailed = function(
     that.handleError(error);
   };
 
-  if (error == remoting.Error.HOST_IS_OFFLINE &&
+  if (error.tag == remoting.Error.Tag.HOST_IS_OFFLINE &&
       that.refreshHostJidIfOffline_) {
     that.refreshHostJidIfOffline_ = false;
     // The plugin will be re-created when the host finished refreshing
@@ -298,14 +298,14 @@ remoting.DesktopRemoting.prototype.handleExtensionMessage = function(
 /**
  * Called when an error needs to be displayed to the user.
  *
- * @param {remoting.Error} errorTag The error to be localized and displayed.
+ * @param {!remoting.Error} error The error to be localized and displayed.
  * @return {void} Nothing.
  */
-remoting.DesktopRemoting.prototype.handleError = function(errorTag) {
-  console.error('Connection failed: ' + errorTag);
+remoting.DesktopRemoting.prototype.handleError = function(error) {
+  console.error('Connection failed:', error.tag);
   remoting.accessCode = '';
 
-  if (errorTag === remoting.Error.AUTHENTICATION_FAILED) {
+  if (error.tag === remoting.Error.Tag.AUTHENTICATION_FAILED) {
     remoting.setMode(remoting.AppMode.HOME);
     remoting.handleAuthFailureAndRelaunch();
     return;
@@ -315,7 +315,7 @@ remoting.DesktopRemoting.prototype.handleError = function(errorTag) {
   this.refreshHostJidIfOffline_ = true;
 
   var errorDiv = document.getElementById('connect-error-message');
-  l10n.localizeElementFromTag(errorDiv, /** @type {string} */ (errorTag));
+  l10n.localizeElementFromTag(errorDiv, error.tag);
 
   var mode = remoting.clientSession ? remoting.desktopConnectedView.getMode()
       : this.app_.getSessionConnector().getConnectionMode();