content/renderer/pepper/event_conversion.cc - Issue 1124963003: Remove ui::KeycodeConverter::CodeToNativeKeycode().

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/renderer/pepper/event_conversion.cc

Issue 1124963003: Remove ui::KeycodeConverter::CodeToNativeKeycode(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@x444048-3a-codes

Patch Set: Remove content/renderer/pepper/usb_key_code_conversion* Created 5 years, 7 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « content/public/test/browser_test_utils.cc ('k') | content/renderer/pepper/usb_key_code_conversion.h » ('j') | content/renderer/pepper/usb_key_code_conversion_win.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/renderer/pepper/event_conversion.cc

diff --git a/content/renderer/pepper/event_conversion.cc b/content/renderer/pepper/event_conversion.cc

index 164e33e40ee905ed1f3528a11865a5d7d13a7fd3..08bee9b5527fa08627afc6085ebe5f638cfd0a46 100644

--- a/content/renderer/pepper/event_conversion.cc

+++ b/content/renderer/pepper/event_conversion.cc

@@ -13,13 +13,13 @@

#include "base/strings/utf_string_conversion_utils.h"

#include "base/strings/utf_string_conversions.h"

#include "content/common/input/web_touch_event_traits.h"

-#include "content/renderer/pepper/usb_key_code_conversion.h"

#include "ppapi/c/pp_input_event.h"

#include "ppapi/shared_impl/ppb_input_event_shared.h"

#include "ppapi/shared_impl/time_conversion.h"

#include "third_party/WebKit/public/platform/WebGamepads.h"

#include "third_party/WebKit/public/platform/WebString.h"

#include "third_party/WebKit/public/web/WebInputEvent.h"

+#include "ui/events/keycodes/dom4/keycode_converter.h"

using ppapi::EventTimeToPPTimeTicks;

using ppapi::InputEventData;

@@ -135,7 +135,8 @@ void AppendKeyEvent(const WebInputEvent& event,

InputEventData result = GetEventWithCommonFieldsAndType(event);

result.event_modifiers = key_event.modifiers;

result.key_code = key_event.windowsKeyCode;

- result.code = CodeForKeyboardEvent(key_event);

+ result.code = ui::KeycodeConverter::DomCodeToCodeString(

+ static_cast<ui::DomCode>(key_event.domCode));

result_events->push_back(result);

}