Event handling support for ozone.

ui/base/ozone/events_ozone.cc

Index: ui/base/ozone/events_ozone.cc
diff --git a/ui/base/ozone/events_ozone.cc b/ui/base/ozone/events_ozone.cc
index 8732ddbe3e5179317f414fa791915b0a99e43cb5..138682245e9f8e401ac84aedfd61ff7f465ae2d5 100644
--- a/ui/base/ozone/events_ozone.cc
+++ b/ui/base/ozone/events_ozone.cc
@@ -1,4 +1,4 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -8,6 +8,8 @@
 
 namespace ui {
 
+void UpdateDeviceList() { NOTIMPLEMENTED(); }
+
 base::TimeDelta EventTimeFromNative(const base::NativeEvent& native_event) {
   ui::Event* event = static_cast<ui::Event*>(native_event);
   return event->time_stamp();
@@ -23,11 +25,16 @@ EventType EventTypeFromNative(const base::NativeEvent& native_event) {
   return event->type();
 }
 
+gfx::Point EventSystemLocationFromNative(
+    const base::NativeEvent& native_event) {
+  ui::LocatedEvent* e = static_cast<ui::LocatedEvent*>(native_event);
+  DCHECK(e->IsMouseEvent() || e->IsTouchEvent() || e->IsGestureEvent() ||
+         e->IsScrollEvent());
+  return e->location();
+}
+
 gfx::Point EventLocationFromNative(const base::NativeEvent& native_event) {
-  ui::LocatedEvent* event = static_cast<ui::LocatedEvent*>(native_event);
-  DCHECK(event->IsMouseEvent() || event->IsTouchEvent() ||
-         event->IsGestureEvent() || event->IsScrollEvent());
-  return event->location();
+  return EventSystemLocationFromNative(native_event);
 }
 
 int GetChangedMouseButtonFlagsFromNative(
@@ -43,10 +50,16 @@ KeyboardCode KeyboardCodeFromNative(const base::NativeEvent& native_event) {
   return event->key_code();
 }
 
+bool IsMouseEvent(const base::NativeEvent& native_event) {
+  ui::Event* e = static_cast<ui::Event*>(native_event);
+  return e->IsMouseEvent();
+}
+
 gfx::Vector2d GetMouseWheelOffset(const base::NativeEvent& native_event) {
   ui::MouseWheelEvent* event = static_cast<ui::MouseWheelEvent*>(native_event);
   DCHECK(event->type() == ET_MOUSEWHEEL);
-  return event->offset();
+  // return event->offset();

[sadrul, 2013/06/06 16:54:30]

Remove

[rjkroege, 2013/06/06 23:05:05]

Done.

+  return gfx::Vector2d();
 }
 
 int GetTouchId(const base::NativeEvent& native_event) {
@@ -99,4 +112,36 @@ bool GetFlingData(const base::NativeEvent& native_event,
   return false;
 }
 
+bool GetGestureTimes(const base::NativeEvent& native_event,
+                     double* start_time,
+                     double* end_time) {
+  *start_time = 0;
+  *end_time = 0;
+  return false;
+}
+
+void SetNaturalScroll(bool /* enabled */) { NOTIMPLEMENTED(); }
+
+bool IsNaturalScrollEnabled() { return false; }
+
+bool IsTouchpadEvent(const base::NativeEvent& event) {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+bool IsNoopEvent(const base::NativeEvent& event) {
+  NOTIMPLEMENTED();
+  return false;
+}
+
+base::NativeEvent CreateNoopEvent() {
+  NOTIMPLEMENTED();
+  return NULL;
+}
+
+int GetModifiersFromKeyState() {
+  NOTIMPLEMENTED();
+  return 0;
+}
+
 }  // namespace ui