Aura on Android: Making events work

ui/events/events_default.cc

 // Copyright (c) 2013 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 "ui/events/ozone/events_ozone.h"
-
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/event_utils.h"
 
 namespace ui {
 
 void UpdateDeviceList() { NOTIMPLEMENTED(); }
 
 base::TimeDelta EventTimeFromNative(const base::NativeEvent& native_event) {
   const ui::Event* event = static_cast<const ui::Event*>(native_event);
@@ skipping 140 matching lines @@
   if (vx_ordinal)
     *vx_ordinal = event->x_offset_ordinal();
   if (vy_ordinal)
     *vy_ordinal = event->y_offset_ordinal();
   if (is_cancel)
     *is_cancel = event->type() == ET_SCROLL_FLING_CANCEL;
 
   return true;
 }
 
 int GetModifiersFromKeyState() {

[no sievers, 2015/10/22 19:08:27]

nit: Looks like this is only used on windows (and not even implemented  in
events_stub.cc or events_x.cc).

You could consider ifdef'ing it in event_utils.h so we don't have the
declaration without definition.

There might be other functions that are not consistently defined, such as
UpdateDeviceList() I think.

[mfomitchev, 2015/10/22 20:34:36]

Got rid of GetModifiersFromKeyState - it was already ifdef'd.
UpdateDeviceList seems to only be implemented on X, but that cleanup should
probably be done in a separate CL.

   NOTIMPLEMENTED();
   return 0;
 }
 
-void DispatchEventFromNativeUiEvent(const base::NativeEvent& native_event,
-                                    base::Callback<void(ui::Event*)> callback) {
-  ui::Event* native_ui_event = static_cast<ui::Event*>(native_event);
-  if (native_ui_event->IsKeyEvent()) {
-    ui::KeyEvent key_event(native_event);
-    callback.Run(&key_event);
-  } else if (native_ui_event->IsMouseWheelEvent()) {
-    ui::MouseWheelEvent wheel_event(native_event);
-    callback.Run(&wheel_event);
-  } else if (native_ui_event->IsMouseEvent()) {
-    ui::MouseEvent mouse_event(native_event);
-    callback.Run(&mouse_event);
-  } else if (native_ui_event->IsTouchEvent()) {
-    ui::TouchEvent touch_event(native_event);
-    callback.Run(&touch_event);
-  } else if (native_ui_event->IsScrollEvent()) {
-    ui::ScrollEvent scroll_event(native_event);
-    callback.Run(&scroll_event);
-  } else if (native_ui_event->IsGestureEvent()) {
-    callback.Run(native_ui_event);
-    // TODO(mohsen): Use the same pattern for scroll/touch/wheel events.
-    // Apparently, there is no need for them to wrap the |native_event|.
-  } else {
-    NOTREACHED();
-  }
-}
-
 }  // namespace ui