diff options
| author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-08 20:45:42 +0000 |
|---|---|---|
| committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-08 20:45:42 +0000 |
| commit | 61e12a2cfb1e6b42131a3084954a0b9c464ed397 (patch) | |
| tree | da73f77ee7caec79b48cc5688bf0fb6745c46c87 /remoting/host | |
| parent | 96d53bc83716567d11bb1cd8f0f0ef4929b6c0ba (diff) | |
| download | chromium_src-61e12a2cfb1e6b42131a3084954a0b9c464ed397.zip chromium_src-61e12a2cfb1e6b42131a3084954a0b9c464ed397.tar.gz chromium_src-61e12a2cfb1e6b42131a3084954a0b9c464ed397.tar.bz2 | |
Remove ChromotingClientMessage
BUG=None
TEST=Remoting unittests
Review URL: http://codereview.chromium.org/5559011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68627 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/host')
| -rw-r--r-- | remoting/host/event_executor_linux.cc | 8 | ||||
| -rw-r--r-- | remoting/host/event_executor_win.cc | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/remoting/host/event_executor_linux.cc b/remoting/host/event_executor_linux.cc index 5096fac..add03fc 100644 --- a/remoting/host/event_executor_linux.cc +++ b/remoting/host/event_executor_linux.cc @@ -292,10 +292,10 @@ bool EventExecutorLinuxPimpl::Init() { void EventExecutorLinuxPimpl::HandleKey(const KeyEvent* key_event) { // TODO(ajwong): This will only work for QWERTY keyboards. - int keysym = ChromotocolKeycodeToX11Keysym(key_event->key()); + int keysym = ChromotocolKeycodeToX11Keysym(key_event->keycode()); if (keysym == -1) { - LOG(WARNING) << "Ignoring unknown key: " << key_event->key(); + LOG(WARNING) << "Ignoring unknown key: " << key_event->keycode(); return; } @@ -303,11 +303,11 @@ void EventExecutorLinuxPimpl::HandleKey(const KeyEvent* key_event) { int keycode = XKeysymToKeycode(display_, keysym); if (keycode == 0) { LOG(WARNING) << "Ignoring undefined keysym: " << keysym - << " for key: " << key_event->key(); + << " for key: " << key_event->keycode(); return; } - VLOG(3) << "Got pepper key: " << key_event->key() + VLOG(3) << "Got pepper key: " << key_event->keycode() << " sending keysym: " << keysym << " to keycode: " << keycode; XTestFakeKeyEvent(display_, keycode, key_event->pressed(), CurrentTime); diff --git a/remoting/host/event_executor_win.cc b/remoting/host/event_executor_win.cc index 1fe3beb..4c92816 100644 --- a/remoting/host/event_executor_win.cc +++ b/remoting/host/event_executor_win.cc @@ -53,7 +53,7 @@ void EventExecutorWin::InjectMouseEvent(const MouseEvent* event, Task* done) { } void EventExecutorWin::HandleKey(const KeyEvent* event) { - int key = event->key(); + int key = event->keycode(); bool down = event->pressed(); // Calculate scan code from virtual key. |