diff options
| author | dcheng <dcheng@chromium.org> | 2014-09-03 20:51:33 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-09-04 03:54:45 +0000 |
| commit | 97b7fc9ff9b9eade1654f1394b5992c2c2a17ef9 (patch) | |
| tree | 4b8377383e1f12bc88b65014b09359b61bdc6256 /mojo/services/native_viewport | |
| parent | 6de6c6eaee01e8aa52e3e380fc2fcd1cc1ef2445 (diff) | |
| download | chromium_src-97b7fc9ff9b9eade1654f1394b5992c2c2a17ef9.zip chromium_src-97b7fc9ff9b9eade1654f1394b5992c2c2a17ef9.tar.gz chromium_src-97b7fc9ff9b9eade1654f1394b5992c2c2a17ef9.tar.bz2 | |
Revert of Removing X11 native_event uses for key events. (patchset #6 id:160001 of https://codereview.chromium.org/479873002/)
Reason for revert:
Causing check_licenses to fail on android_clang_dbg_recipe trybot:
The following files are whitelisted unnecessarily. You must remove the following files from the whitelist.
content/browser/renderer_host/web_input_event_aurax11.cc
The following files are whitelisted, but do not exist.
content/browser/renderer_host/web_input_event_aurax11.cc
Original issue's description:
> Removing uses of X11 native key events.
>
> BUG=380349
>
> Committed: https://chromium.googlesource.com/chromium/src/+/bbb7ea7c66f18298079eea4a6b24834986f4a822
TBR=sadrul@chromium.org,sky@chromium.org,erg@chromium.org,jamesr@chromium.org,kpschoedel@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=380349
Review URL: https://codereview.chromium.org/536313002
Cr-Commit-Position: refs/heads/master@{#293254}
Diffstat (limited to 'mojo/services/native_viewport')
| -rw-r--r-- | mojo/services/native_viewport/platform_viewport_x11.cc | 6 |
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 d4914c7..dbf7fb8 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( - 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); |