diff options
| author | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 23:10:58 +0000 |
|---|---|---|
| committer | wez@chromium.org <wez@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 23:10:58 +0000 |
| commit | 6fd652d926f8ffe06616e17bf1491b9e8ccf39c0 (patch) | |
| tree | 97b8f5b63148dbb6d09118f0d24f34c46395e589 /remoting | |
| parent | ca6df68f187851c26a93fb280c701fc91ac55a5b (diff) | |
| download | chromium_src-6fd652d926f8ffe06616e17bf1491b9e8ccf39c0.zip chromium_src-6fd652d926f8ffe06616e17bf1491b9e8ccf39c0.tar.gz chromium_src-6fd652d926f8ffe06616e17bf1491b9e8ccf39c0.tar.bz2 | |
Fix the USB keycode field name in injectKeyEvent API.
BUG=121168
TEST=Web-app's Ctrl-Alt-Del button still works with plugin & web-app patched.
Review URL: http://codereview.chromium.org/10026008
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131669 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting')
| -rw-r--r-- | remoting/client/plugin/chromoting_instance.cc | 2 | ||||
| -rw-r--r-- | remoting/webapp/client_plugin_async.js | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/remoting/client/plugin/chromoting_instance.cc b/remoting/client/plugin/chromoting_instance.cc index c2f4585..70d481f 100644 --- a/remoting/client/plugin/chromoting_instance.cc +++ b/remoting/client/plugin/chromoting_instance.cc @@ -257,7 +257,7 @@ void ChromotingInstance::HandleMessage(const pp::Var& message) { } else if (method == "injectKeyEvent") { int usb_keycode = 0; bool is_pressed = false; - if (!data->GetInteger("usb_keycode", &usb_keycode) || + if (!data->GetInteger("usbKeycode", &usb_keycode) || !data->GetBoolean("pressed", &is_pressed)) { LOG(ERROR) << "Invalid injectKeyEvent."; return; diff --git a/remoting/webapp/client_plugin_async.js b/remoting/webapp/client_plugin_async.js index b35504f..368eefa 100644 --- a/remoting/webapp/client_plugin_async.js +++ b/remoting/webapp/client_plugin_async.js @@ -313,7 +313,7 @@ remoting.ClientPluginAsync.prototype.injectKeyEvent = function(usbKeycode, pressed) { this.plugin.postMessage(JSON.stringify( { method: 'injectKeyEvent', data: { - 'usb_keycode': usbKeycode, + 'usbKeycode': usbKeycode, 'pressed': pressed} })); }; |