diff options
| author | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-27 19:06:35 +0000 |
|---|---|---|
| committer | garykac@chromium.org <garykac@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-01-27 19:06:35 +0000 |
| commit | 9e1abbc82e974719b757844402ec74aba660a3c8 (patch) | |
| tree | 383f4cd93f6534ec1d55ba1d8a9dec2d46475372 /remoting/client | |
| parent | f4821400355c5126dda788043ef6e148c067d160 (diff) | |
| download | chromium_src-9e1abbc82e974719b757844402ec74aba660a3c8.zip chromium_src-9e1abbc82e974719b757844402ec74aba660a3c8.tar.gz chromium_src-9e1abbc82e974719b757844402ec74aba660a3c8.tar.bz2 | |
Move PPB_KeyboardInputEvent.GetCode to stable.
Remove GetUsbKeycode and SetUsbKeyCode since they were earlier verisons of this API that are not being used anywhere.
Remove all the KeyboardEvent _Dev files since they will no longer be used once GetCode is moved out.
BUG=286359,284774,275049
R=binji@chromium.org, dcheng@chromium.org, dmichael@chromium.org
Review URL: https://codereview.chromium.org/112983005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@247275 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'remoting/client')
| -rw-r--r-- | remoting/client/plugin/pepper_input_handler.cc | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/remoting/client/plugin/pepper_input_handler.cc b/remoting/client/plugin/pepper_input_handler.cc index d4b6f60..9069f1a 100644 --- a/remoting/client/plugin/pepper_input_handler.cc +++ b/remoting/client/plugin/pepper_input_handler.cc @@ -5,7 +5,6 @@ #include "remoting/client/plugin/pepper_input_handler.h" #include "base/logging.h" -#include "ppapi/c/dev/ppb_keyboard_input_event_dev.h" #include "ppapi/cpp/image_data.h" #include "ppapi/cpp/input_event.h" #include "ppapi/cpp/module_impl.h" @@ -37,18 +36,8 @@ PepperInputHandler::~PepperInputHandler() { // Helper function to get the USB key code using the Dev InputEvent interface. uint32_t GetUsbKeyCode(pp::KeyboardInputEvent pp_key_event) { - const PPB_KeyboardInputEvent_Dev* key_event_interface = - reinterpret_cast<const PPB_KeyboardInputEvent_Dev*>( - pp::Module::Get()->GetBrowserInterface( - PPB_KEYBOARD_INPUT_EVENT_DEV_INTERFACE)); - if (!key_event_interface) - return 0; - // Get the DOM3 |code| as a string. - pp::Var codevar(key_event_interface->GetCode(pp_key_event.pp_resource())); - if (!codevar.is_string()) - return 0; - std::string codestr = codevar.AsString(); + std::string codestr = pp_key_event.GetCode().AsString(); // Convert the |code| string into a USB keycode. ui::KeycodeConverter* key_converter = ui::KeycodeConverter::GetInstance(); |