[Webapp Refactor] Reparent the ConnectedView into the delegate.

remoting/webapp/app_remoting/js/app_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 application
  * remoting ("AppRemoting" or AR).
  */
 
 'use strict';
 
 /** @suppress {duplicate} */
 var remoting = remoting || {};
 
 /**
  * @param {remoting.Application} app The main app that owns this delegate.
  * @constructor
  * @implements {remoting.Application.Delegate}
+ * @implements {remoting.ProtocolExtension}
  */
 remoting.AppRemoting = function(app) {
   app.setDelegate(this);
 
   /** @private {remoting.ApplicationContextMenu} */
   this.contextMenu_ = null;
 
   /** @private {remoting.KeyboardLayoutsMenu} */
   this.keyboardLayoutsMenu_ = null;
 
   /** @private {remoting.WindowActivationMenu} */
   this.windowActivationMenu_ = null;
 
-   /** @private {base.RepeatingTimer} */
-   this.pingTimer_ = null;
+  /** @private {base.RepeatingTimer} */
+  this.pingTimer_ = null;
+
+  /** @private {remoting.DesktopConnectedView} */
+  this.connectedView_ = null;
 };
 
 /**
  * Type definition for the RunApplicationResponse returned by the API.
  *
  * @constructor
  * @private
  */
 remoting.AppRemoting.AppHostResponse = function() {
   /** @type {string} */
@@ skipping 180 matching lines @@
  * @return {void} Nothing.
  */
 remoting.AppRemoting.prototype.handleConnected = function(connectionInfo) {
   remoting.identity.getUserInfo().then(
       function(userInfo) {
         remoting.clientSession.sendClientMessage(
             'setUserDisplayInfo',
             JSON.stringify({fullName: userInfo.name}));
       });
 
+  remoting.app.getSessionConnector().registerProtocolExtension(this);
+
   var clientSession = connectionInfo.session();
   // Set up a ping at 10-second intervals to test the connection speed.
   var CONNECTION_SPEED_PING_INTERVAL = 10 * 1000;
   this.pingTimer_ = new base.RepeatingTimer(function () {
     var message = { timestamp: new Date().getTime() };
     clientSession.sendClientMessage('pingRequest', JSON.stringify(message));
   }, CONNECTION_SPEED_PING_INTERVAL);
+
+  // TODO(kelvinp): Moves all app remoting specific logic into

[Jamie, 2015/03/18 01:03:56]

s/Moves/Move/

[kelvinp, 2015/03/18 18:44:22]

Done.

+  // remoting.AppRemotingView.
+  this.connectedView_ = new remoting.DesktopConnectedView(
+      document.getElementById('client-container'), connectionInfo,
+      this.getDefaultRemapKeys());
 };
 
 /**
  * Called when the current session has been disconnected.
  *
  * @return {void} Nothing.
  */
 remoting.AppRemoting.prototype.handleDisconnected = function() {
   // Cancel the ping when the connection closes.
   base.dispose(this.pingTimer_);
   this.pingTimer_ = null;
 
+  base.dispose(this.connectedView_);
+  this.connectedView_ = null;
+
   chrome.app.window.current().close();
 };
 
 /**
  * Called when the current session's connection has failed.
  *
  * @param {remoting.SessionConnector} connector
  * @param {!remoting.Error} error
  * @return {void} Nothing.
  */
 remoting.AppRemoting.prototype.handleConnectionFailed = function(
     connector, error) {
   this.handleError(error);
 };
 
 /**
  * Called when the current session has reached the point where the host has
  * started streaming video frames to the client.
  *
  * @return {void} Nothing.
  */
 remoting.AppRemoting.prototype.handleVideoStreamingStarted = function() {
   remoting.LoadingWindow.close();
 };
 
+
+/** @return {Array<string>} */
+remoting.AppRemoting.prototype.getExtensionTypes = function() {
+  return ['openURL', 'onWindowRemoved', 'onWindowAdded',
+          'onAllWindowsMinimized', 'setKeyboardLayouts', 'pingResponse'];
+};
+
 /**
- * Called when an extension message needs to be handled.
- *
- * @param {string} type The type of the extension message.
+ * @param {function(string,string)} sendMessageToHost Callback to send a message
+ *     to the host.
+ */
+remoting.AppRemoting.prototype.startExtension = function(sendMessageToHost) {
+};
+
+/**
+ * @param {string} type The message type.
  * @param {Object} message The parsed extension message data.
- * @return {boolean} True if the extension message was recognized.
  */
-remoting.AppRemoting.prototype.handleExtensionMessage = function(
-    type, message) {
+remoting.AppRemoting.prototype.onExtensionMessage = function(type, message) {
   switch (type) {
 
     case 'openURL':
       // URL requests from the hosted app are untrusted, so disallow anything
       // other than HTTP or HTTPS.
       var url = getStringAttr(message, 'url');
       if (url.indexOf('http:') != 0 && url.indexOf('https:') != 0) {
         console.error('Bad URL: ' + url);
       } else {
         window.open(url);
@@ skipping 46 matching lines @@
       chrome.i18n.getMessage(/*i18n-content*/'CONNECTION_FAILED'),
       chrome.i18n.getMessage(error.getTag()));
 };
 
 /**
  * Close the loading window before exiting.
  */
 remoting.AppRemoting.prototype.handleExit = function() {
   remoting.LoadingWindow.close();
 };