| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 /** @suppress {duplicate} */ | 5 /** @suppress {duplicate} */ |
| 6 var remoting = remoting || {}; | 6 var remoting = remoting || {}; |
| 7 | 7 |
| 8 (function() { | 8 (function() { |
| 9 | 9 |
| 10 'use strict'; | 10 'use strict'; |
| (...skipping 85 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 96 remoting.DesktopRemotingActivity.prototype.onConnected = | 96 remoting.DesktopRemotingActivity.prototype.onConnected = |
| 97 function(connectionInfo) { | 97 function(connectionInfo) { |
| 98 this.connectingDialog_.hide(); | 98 this.connectingDialog_.hide(); |
| 99 remoting.setMode(remoting.AppMode.IN_SESSION); | 99 remoting.setMode(remoting.AppMode.IN_SESSION); |
| 100 if (!base.isAppsV2()) { | 100 if (!base.isAppsV2()) { |
| 101 remoting.toolbar.center(); | 101 remoting.toolbar.center(); |
| 102 remoting.toolbar.preview(); | 102 remoting.toolbar.preview(); |
| 103 } | 103 } |
| 104 | 104 |
| 105 this.connectedView_ = remoting.DesktopConnectedView.create( | 105 this.connectedView_ = remoting.DesktopConnectedView.create( |
| 106 base.getHtmlElement('client-container'), connectionInfo); | 106 base.getHtmlElement('client-container'), connectionInfo, |
| 107 this.logger_); |
| 107 | 108 |
| 108 // Apply the default or previously-specified keyboard remapping. | 109 // Apply the default or previously-specified keyboard remapping. |
| 109 var remapping = connectionInfo.host().options.getRemapKeys(); | 110 var remapping = connectionInfo.host().options.getRemapKeys(); |
| 110 this.connectedView_.setRemapKeys(remapping); | 111 this.connectedView_.setRemapKeys(remapping); |
| 111 this.parentActivity_.onConnected(connectionInfo); | 112 this.parentActivity_.onConnected(connectionInfo); |
| 112 | 113 |
| 113 // ESC key feature tracking | 114 // ESC key feature tracking |
| 114 var pluginElement = connectionInfo.plugin().element(); | 115 var pluginElement = connectionInfo.plugin().element(); |
| 115 var onKeyDown = function(/** KeyboardEvent **/ event) { | 116 var onKeyDown = function(/** KeyboardEvent **/ event) { |
| 116 if (event && event.keyCode == ESCAPE_KEY_CODE | 117 if (event && event.keyCode == ESCAPE_KEY_CODE |
| (...skipping 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 176 remoting.DesktopRemotingActivity.prototype.getSession = function() { | 177 remoting.DesktopRemotingActivity.prototype.getSession = function() { |
| 177 return this.session_; | 178 return this.session_; |
| 178 }; | 179 }; |
| 179 | 180 |
| 180 /** @return {remoting.ConnectingDialog} */ | 181 /** @return {remoting.ConnectingDialog} */ |
| 181 remoting.DesktopRemotingActivity.prototype.getConnectingDialog = function() { | 182 remoting.DesktopRemotingActivity.prototype.getConnectingDialog = function() { |
| 182 return this.connectingDialog_; | 183 return this.connectingDialog_; |
| 183 }; | 184 }; |
| 184 | 185 |
| 185 })(); | 186 })(); |
| OLD | NEW |