Removing X11 native_event uses for key events.

ash/accelerators/key_hold_detector.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/accelerators/key_hold_detector.h"
 
 #include <X11/Xlib.h>
 
 #undef RootWindow
 #undef Status
 
 #include "ash/shell.h"
 #include "base/message_loop/message_loop.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/events/event_dispatcher.h"
 #include "ui/events/event_processor.h"
 
 namespace ash {
 namespace {
 
-void DispatchPressedEvent(XEvent native_event,
+void DispatchPressedEvent(ui::KeyEvent event,

[sadrul, 2014/08/19 03:46:19]

const &

[kpschoedel, 2014/08/19 21:58:10]

This gets passed to the non-const OnEventFromSource(), and base::Bind doesn't
allow a non-const reference, so I've just made it a pointer to avoid copying.

                           scoped_ptr<aura::WindowTracker> tracker) {
   // The target window may be gone.
   if (tracker->windows().empty())
     return;
   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;
+  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
 
 KeyHoldDetector::KeyHoldDetector(scoped_ptr<Delegate> delegate)
     : state_(INITIAL),
       delegate_(delegate.Pass()) {}
 
 KeyHoldDetector::~KeyHoldDetector() {}
 
@@ skipping 35 matching lines @@
         delegate_->OnKeyUnhold(event);
         event->StopPropagation();
         break;
       }
     }
     state_ = INITIAL;
   }
 }
 
 }  // namespace ash