Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(595)

Side by Side Diff: remoting/webapp/crd/js/desktop_remoting_activity.js

Issue 1343503002: Fix right-Ctrl mapping menu item. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « remoting/webapp/crd/js/desktop_connected_view.js ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 77 matching lines...) Expand 10 before | Expand all | Expand 10 after
88 if (!base.isAppsV2()) { 88 if (!base.isAppsV2()) {
89 remoting.toolbar.center(); 89 remoting.toolbar.center();
90 remoting.toolbar.preview(); 90 remoting.toolbar.preview();
91 } 91 }
92 92
93 this.connectedView_ = remoting.DesktopConnectedView.create( 93 this.connectedView_ = remoting.DesktopConnectedView.create(
94 document.getElementById('client-container'), connectionInfo); 94 document.getElementById('client-container'), connectionInfo);
95 95
96 // Apply the default or previously-specified keyboard remapping. 96 // Apply the default or previously-specified keyboard remapping.
97 var remapping = connectionInfo.host().options.remapKeys; 97 var remapping = connectionInfo.host().options.remapKeys;
98 if (base.isEmptyObject(remapping) && remoting.platformIsChromeOS()) { 98 if (base.isEmptyObject(remapping) && remoting.platformIsChromeOS()) {
Sergey Ulanov 2015/09/14 18:01:57 it looks wrong that the remappings list is not all
Jamie 2015/09/15 00:27:00 Good idea. It takes quite a lot of refactoring to
99 // Under ChromeOS, remap the right Control key to the right Win/Cmd key. 99 // Under ChromeOS, remap the right Control key to the right Win/Cmd key.
100 remapping = {0x0700e4: 0x0700e7}; 100 remapping = {0x0700e4: 0x0700e7};
101 } 101 }
102 connectionInfo.plugin().setRemapKeys(remapping); 102 this.connectedView_.setRemapKeys(remapping);
103 103
104 if (connectionInfo.plugin().hasCapability( 104 if (connectionInfo.plugin().hasCapability(
105 remoting.ClientSession.Capability.VIDEO_RECORDER)) { 105 remoting.ClientSession.Capability.VIDEO_RECORDER)) {
106 var recorder = new remoting.VideoFrameRecorder(); 106 var recorder = new remoting.VideoFrameRecorder();
107 connectionInfo.plugin().extensions().register(recorder); 107 connectionInfo.plugin().extensions().register(recorder);
108 this.connectedView_.setVideoFrameRecorder(recorder); 108 this.connectedView_.setVideoFrameRecorder(recorder);
109 } 109 }
110 110
111 this.parentActivity_.onConnected(connectionInfo); 111 this.parentActivity_.onConnected(connectionInfo);
112 }; 112 };
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 remoting.DesktopRemotingActivity.prototype.getSession = function() { 162 remoting.DesktopRemotingActivity.prototype.getSession = function() {
163 return this.session_; 163 return this.session_;
164 }; 164 };
165 165
166 /** @return {remoting.ConnectingDialog} */ 166 /** @return {remoting.ConnectingDialog} */
167 remoting.DesktopRemotingActivity.prototype.getConnectingDialog = function() { 167 remoting.DesktopRemotingActivity.prototype.getConnectingDialog = function() {
168 return this.connectingDialog_; 168 return this.connectingDialog_;
169 }; 169 };
170 170
171 })(); 171 })();
OLDNEW
« no previous file with comments | « remoting/webapp/crd/js/desktop_connected_view.js ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698