[Chromoting] Move app-specific code out of remoting.js

remoting/webapp/crd/js/desktop_remoting.js

 // Copyright 2014 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
  * This class implements the functionality that is specific to desktop
  * remoting ("Chromoting" or CRD).
  */
 
@@ skipping 58 matching lines @@
           }
         }
     );
 
   } else {
     remoting.fullscreen = new remoting.FullscreenAppsV1();
     remoting.toolbar = new remoting.Toolbar(
         document.getElementById('session-toolbar'));
     remoting.optionsMenu = remoting.toolbar.createOptionsMenu();
 
-    window.addEventListener('beforeunload', remoting.promptClose, false);
+    window.addEventListener('beforeunload',
+                            this.promptClose_.bind(this), false);
     window.addEventListener('unload',
                             remoting.app.disconnect.bind(remoting.app), false);
   }
 
   remoting.initHostlist_();
 
   var homeFeedback = new remoting.MenuButton(
       document.getElementById('help-feedback-main'));
   var toolbarFeedback = new remoting.MenuButton(
       document.getElementById('help-feedback-toolbar'));
@@ skipping 12 matching lines @@
   // For Apps v1, check the tab type to warn the user if they are not getting
   // the best keyboard experience.
   if (!base.isAppsV2() && !remoting.platformIsMac()) {
     /** @param {boolean} isWindowed */
     var onIsWindowed = function(isWindowed) {
       if (!isWindowed) {
         document.getElementById('startup-mode-box-me2me').hidden = false;
         document.getElementById('startup-mode-box-it2me').hidden = false;
       }
     };
-    isWindowed_(onIsWindowed);
+    this.isWindowed_(onIsWindowed);
   }
 
   remoting.ClientPlugin.factory.preloadPlugin();
 }
 
 /**
  * Start the application. Once start() is called, the delegate can assume that
  * the user has consented to all permissions specified in the manifest.
  *
  * @param {remoting.SessionConnector} connector
  * @param {string} token An OAuth access token. The delegate should not cache
  *     this token, but can assume that it will remain valid during application
  *     start-up.
  */
 remoting.DesktopRemoting.prototype.start = function(connector, token) {
   remoting.identity.getEmail().then(
       function(/** string */ email) {
         document.getElementById('current-email').innerText = email;
         document.getElementById('get-started-it2me').disabled = false;
         document.getElementById('get-started-me2me').disabled = false;
       });
 };
 
 /**
- * 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.
- */
-remoting.DesktopRemoting.prototype.signInFailed = function(error) {
-  remoting.showErrorMessage(error);
-};
-
-/**
  * @return {string} Application product name to be used in UI.
  */
 remoting.DesktopRemoting.prototype.getApplicationName = function() {
   return chrome.i18n.getMessage(/*i18n-content*/'PRODUCT_NAME');
 };
 
 /**
  * @return {string} The default remap keys for the current platform.
  */
 remoting.DesktopRemoting.prototype.getDefaultRemapKeys = function() {
@@ skipping 161 matching lines @@
   var mode = remoting.clientSession ? remoting.desktopConnectedView.getMode()
       : this.app_.getSessionConnector().getConnectionMode();
   if (mode == remoting.DesktopConnectedView.Mode.IT2ME) {
     remoting.setMode(remoting.AppMode.CLIENT_CONNECT_FAILED_IT2ME);
   } else {
     remoting.setMode(remoting.AppMode.CLIENT_CONNECT_FAILED_ME2ME);
   }
 };
 
 /**
+ * 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.
+ */
+remoting.DesktopRemoting.prototype.handleAuthError = function(error) {

[garykac, 2015/03/19 01:03:43]

function copied from remoting.showErrorMessage

+  l10n.localizeElementFromTag(
+      document.getElementById('token-refresh-error-message'),
+      error.getTag());
+  var auth_failed = (error.hasTag(remoting.Error.Tag.AUTHENTICATION_FAILED));
+  if (auth_failed && base.isAppsV2()) {
+    remoting.handleAuthFailureAndRelaunch();
+  } else {
+    document.getElementById('token-refresh-auth-failed').hidden = !auth_failed;
+    document.getElementById('token-refresh-other-error').hidden = auth_failed;
+    remoting.setMode(remoting.AppMode.TOKEN_REFRESH_FAILED);
+  }
+};
+
+/**
  * No cleanup required for desktop remoting.
  */
 remoting.DesktopRemoting.prototype.handleExit = function() {
 };
+
+/**
+ * Determine whether or not the app is running in a window.
+ * @param {function(boolean):void} callback Callback to receive whether or not
+ *     the current tab is running in windowed mode.
+ * @private
+ */
+remoting.DesktopRemoting.prototype.isWindowed_ = function(callback) {

[garykac, 2015/03/19 01:03:43]

moved here from remoting.js

+  /** @param {chrome.Window} win The current window. */
+  var windowCallback = function(win) {
+    callback(win.type == 'popup');
+  };
+  /** @param {chrome.Tab} tab The current tab. */
+  var tabCallback = function(tab) {
+    if (tab.pinned) {
+      callback(false);
+    } else {
+      chrome.windows.get(tab.windowId, null, windowCallback);
+    }
+  };
+  if (chrome.tabs) {
+    chrome.tabs.getCurrent(tabCallback);
+  } else {
+    console.error('chome.tabs is not available.');
+  }
+}
+
+/**
+ * If an IT2Me client or host is active then prompt the user before closing.
+ * If a Me2Me client is active then don't bother, since closing the window is
+ * the more intuitive way to end a Me2Me session, and re-connecting is easy.
+ * @private
+ */
+remoting.DesktopRemoting.prototype.promptClose_ = function() {

[garykac, 2015/03/19 01:03:44]

moved here from remoting.js

+  if (remoting.desktopConnectedView &&

[kelvinp, 2015/03/19 17:50:20]

desktopConnectedView is gone now.  Need remerging.
You can get the mode from getSessionConnector().

[garykac, 2015/03/19 21:58:38]

Acknowledged.

+      remoting.desktopConnectedView.getMode() ==
+          remoting.DesktopConnectedView.Mode.IT2ME) {
+    switch (remoting.currentMode) {
+      case remoting.AppMode.CLIENT_CONNECTING:
+      case remoting.AppMode.HOST_WAITING_FOR_CODE:
+      case remoting.AppMode.HOST_WAITING_FOR_CONNECTION:
+      case remoting.AppMode.HOST_SHARED:
+      case remoting.AppMode.IN_SESSION:
+        return chrome.i18n.getMessage(/*i18n-content*/'CLOSE_PROMPT');
+      default:
+        return null;
+    }
+  }
+};