summaryrefslogtreecommitdiffstats
path: root/mojo/services/native_viewport
diff options
context:
space:
mode:
authorkpschoedel <kpschoedel@chromium.org>2014-09-05 07:53:06 -0700
committerCommit bot <commit-bot@chromium.org>2014-09-05 14:54:56 +0000
commit19537df7b11b6e634c16a3073a77b98db3d7b61f (patch)
treec972bd79179526ee982f371a6dd0806dc89d8660 /mojo/services/native_viewport
parent95e4bfd7a9fd1333343a5a6bfc7c6ef03cbe10ce (diff)
downloadchromium_src-19537df7b11b6e634c16a3073a77b98db3d7b61f.zip
chromium_src-19537df7b11b6e634c16a3073a77b98db3d7b61f.tar.gz
chromium_src-19537df7b11b6e634c16a3073a77b98db3d7b61f.tar.bz2
Removing uses of X11 native key events.
BUG=380349 Committed: https://chromium.googlesource.com/chromium/src/+/bbb7ea7c66f18298079eea4a6b24834986f4a822 Review URL: https://codereview.chromium.org/479873002 Cr-Commit-Position: refs/heads/master@{#293520}
Diffstat (limited to 'mojo/services/native_viewport')
-rw-r--r--mojo/services/native_viewport/platform_viewport_x11.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/mojo/services/native_viewport/platform_viewport_x11.cc b/mojo/services/native_viewport/platform_viewport_x11.cc
index dbf7fb8..d4914c7 100644
--- a/mojo/services/native_viewport/platform_viewport_x11.cc
+++ b/mojo/services/native_viewport/platform_viewport_x11.cc
@@ -104,9 +104,9 @@ class PlatformViewportX11 : public PlatformViewport,
char_event.SetExtendedKeyEventData(scoped_ptr<ui::ExtendedKeyEventData>(
new MojoExtendedKeyEventData(
- ui::WindowsKeycodeFromNative(key_press_event->native_event()),
- ui::TextFromNative(key_press_event->native_event()),
- ui::UnmodifiedTextFromNative(key_press_event->native_event()))));
+ key_press_event->GetLocatedWindowsKeyboardCode(),
+ key_press_event->GetText(),
+ key_press_event->GetUnmodifiedText())));
char_event.set_platform_keycode(key_press_event->platform_keycode());
delegate_->OnEvent(&char_event);