| Index: remoting/webapp/app_remoting/js/app_remoting.js
 | 
| diff --git a/remoting/webapp/app_remoting/js/app_remoting.js b/remoting/webapp/app_remoting/js/app_remoting.js
 | 
| index 83493ebf5e370678727c054bb3d800840b2ba9c3..e1efb3ac947857c275f30a424308518a28cf1a8f 100644
 | 
| --- a/remoting/webapp/app_remoting/js/app_remoting.js
 | 
| +++ b/remoting/webapp/app_remoting/js/app_remoting.js
 | 
| @@ -211,18 +211,6 @@ remoting.AppRemoting.prototype.runApplicationUrl = function() {
 | 
|  };
 | 
|  
 | 
|  /**
 | 
| - * @return {string} The default remap keys for the current platform.
 | 
| - */
 | 
| -remoting.AppRemoting.prototype.getDefaultRemapKeys = function() {
 | 
| -  // Map Cmd to Ctrl on Mac since hosts typically use Ctrl for keyboard
 | 
| -  // shortcuts, but we want them to act as natively as possible.
 | 
| -  if (remoting.platformIsMac()) {
 | 
| -    return '0x0700e3>0x0700e0,0x0700e7>0x0700e4';
 | 
| -  }
 | 
| -  return '';
 | 
| -};
 | 
| -
 | 
| -/**
 | 
|   * Called when a new session has been connected.
 | 
|   *
 | 
|   * @param {remoting.ConnectionInfo} connectionInfo
 | 
| @@ -249,8 +237,13 @@ remoting.AppRemoting.prototype.handleConnected = function(connectionInfo) {
 | 
|    // TODO(kelvinp): Move all app remoting specific logic into
 | 
|    // remoting.AppRemotingView.
 | 
|    this.connectedView_ = new remoting.DesktopConnectedView(
 | 
| -      document.getElementById('client-container'), connectionInfo,
 | 
| -      this.getDefaultRemapKeys());
 | 
| +      document.getElementById('client-container'), connectionInfo);
 | 
| +
 | 
| +  // Map Cmd to Ctrl on Mac since hosts typically use Ctrl for keyboard
 | 
| +  // shortcuts, but we want them to act as natively as possible.
 | 
| +  if (remoting.platformIsMac()) {
 | 
| +    connectionInfo.plugin().setRemapKeys('0x0700e3>0x0700e0,0x0700e7>0x0700e4');
 | 
| +  }
 | 
|  };
 | 
|  
 | 
|  /**
 | 
| 
 |