Skip to content

Commit

Permalink
[Chromoting] Rename usb_keycode proto field to be consistent with key…
Browse files Browse the repository at this point in the history
…code field.

BUG=none
TEST=none


Review URL: http://codereview.chromium.org/9623008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@125509 0039d316-1c4b-4281-b951-d872f2087c98
  • Loading branch information
garykac@chromium.org committed Mar 8, 2012
1 parent 1110c3e commit 271a33d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 3 deletions.
3 changes: 1 addition & 2 deletions remoting/client/plugin/pepper_input_handler.cc
Original file line number Diff line number Diff line change
Expand Up @@ -47,8 +47,7 @@ bool PepperInputHandler::HandleInputEvent(const pp::InputEvent& event) {
key_event.set_keycode(pp_key_event.GetKeyCode());
uint32 keycode = GetUsbKeyCode(pp_key_event);
if (keycode != 0)
key_event.set_usb_key_code(keycode);
LOG(INFO) << "keycode: " << std::hex << keycode << std::dec;
key_event.set_usb_keycode(keycode);
key_event.set_pressed(event.GetType() == PP_INPUTEVENT_TYPE_KEYDOWN);
input_stub_->InjectKeyEvent(key_event);
return true;
Expand Down
2 changes: 1 addition & 1 deletion remoting/proto/event.proto
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ message KeyEvent {
// The USB key code.
// The upper 16-bits are the USB Page (0x07 for key events).
// The lower 16-bits are the USB Usage ID (which identifies the actual key).
optional uint32 usb_key_code = 3;
optional uint32 usb_keycode = 3;
}

// Defines a mouse event message on the event channel.
Expand Down

0 comments on commit 271a33d

Please sign in to comment.