Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(18)

Unified Diff: ash/accelerators/key_hold_detector.cc

Issue 479873002: Removing X11 native_event uses for key events. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove web_input_event_aurax11.cc from Android license whitelist. 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
Index: ash/accelerators/key_hold_detector.cc
diff --git a/ash/accelerators/key_hold_detector.cc b/ash/accelerators/key_hold_detector.cc
index 131568eaf6414f42c44375293fcf85a584d078a0..79cd93d5248361c28430c0673c7c737ce157433f 100644
--- a/ash/accelerators/key_hold_detector.cc
+++ b/ash/accelerators/key_hold_detector.cc
@@ -19,29 +19,30 @@
namespace ash {
namespace {
-void DispatchPressedEvent(XEvent native_event,
+void DispatchPressedEvent(const ui::KeyEvent& key_event,
scoped_ptr<aura::WindowTracker> tracker) {
// The target window may be gone.
if (tracker->windows().empty())
return;
+ ui::KeyEvent event(key_event);
aura::Window* target = *(tracker->windows().begin());
- ui::KeyEvent event(&native_event);
- event.set_flags(event.flags() | ui::EF_IS_SYNTHESIZED);
ui::EventDispatchDetails result ALLOW_UNUSED =
target->GetHost()->event_processor()->OnEventFromSource(&event);
}
void PostPressedEvent(ui::KeyEvent* event) {
// Modify RELEASED event to PRESSED event.
- XEvent xkey = *(event->native_event());
- xkey.xkey.type = KeyPress;
- xkey.xkey.state |= ShiftMask;
+ const ui::KeyEvent pressed_event(
+ ui::ET_KEY_PRESSED,
+ event->key_code(),
+ event->code(),
+ event->flags() | ui::EF_SHIFT_DOWN | ui::EF_IS_SYNTHESIZED);
scoped_ptr<aura::WindowTracker> tracker(new aura::WindowTracker);
tracker->Add(static_cast<aura::Window*>(event->target()));
base::MessageLoopForUI::current()->PostTask(
FROM_HERE,
- base::Bind(&DispatchPressedEvent, xkey, base::Passed(&tracker)));
+ base::Bind(&DispatchPressedEvent, pressed_event, base::Passed(&tracker)));
}
} // namespace
« no previous file with comments | « android_webview/tools/third_party_files_whitelist.txt ('k') | content/browser/renderer_host/web_input_event_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698