Aura on Android: Making events work

ui/events/events_default.cc

Index: ui/events/events_default.cc
diff --git a/ui/events/ozone/events_ozone.cc b/ui/events/events_default.cc
similarity index 80%
copy from ui/events/ozone/events_ozone.cc
copy to ui/events/events_default.cc
index 76fe090de19dee3341ae49da728405a32b786bea..4fb85a3425440abb76851d193181cf76a510891a 100644
--- a/ui/events/ozone/events_ozone.cc
+++ b/ui/events/events_default.cc
@@ -2,8 +2,6 @@
 // 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"
@@ -164,36 +162,4 @@ bool GetFlingData(const base::NativeEvent& native_event,
   return true;
 }
 
-int GetModifiersFromKeyState() {
-  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