mojo/services/native_viewport/platform_viewport_x11.cc - Issue 548303003: Revert of Removing X11 native_event uses for key events.

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: mojo/services/native_viewport/platform_viewport_x11.cc

Issue 548303003: Revert of Removing X11 native_event uses for key events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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/renderer/render_view_browsertest.cc ('k') | mojo/services/public/cpp/input_events/lib/input_events_type_converters.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: mojo/services/native_viewport/platform_viewport_x11.cc

diff --git a/mojo/services/native_viewport/platform_viewport_x11.cc b/mojo/services/native_viewport/platform_viewport_x11.cc

index d4914c7586fa92ff35e9a47d3dd052eccb9d3009..dbf7fb80d8718faecbefad341111aa6ccff66fc1 100644

--- a/mojo/services/native_viewport/platform_viewport_x11.cc

+++ b/mojo/services/native_viewport/platform_viewport_x11.cc

@@ -104,9 +104,9 @@

char_event.SetExtendedKeyEventData(scoped_ptr<ui::ExtendedKeyEventData>(

new MojoExtendedKeyEventData(

- key_press_event->GetLocatedWindowsKeyboardCode(),

- key_press_event->GetText(),

- key_press_event->GetUnmodifiedText())));

+ ui::WindowsKeycodeFromNative(key_press_event->native_event()),

+ ui::TextFromNative(key_press_event->native_event()),

+ ui::UnmodifiedTextFromNative(key_press_event->native_event()))));

char_event.set_platform_keycode(key_press_event->platform_keycode());

delegate_->OnEvent(&char_event);