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

Unified Diff: ui/base/ozone/events_ozone.cc

Issue 16466003: Event handling support for ozone. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: additional fixes Created 7 years, 6 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: ui/base/ozone/events_ozone.cc
diff --git a/ui/base/ozone/events_ozone.cc b/ui/base/ozone/events_ozone.cc
index 8732ddbe3e5179317f414fa791915b0a99e43cb5..60d8eacb766aa1ffb858ca45e75382ca2d5edd85 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);
sky 2013/06/07 04:57:25 Can this be const ui::LocatedEvent* ?
rjkroege 2013/06/07 21:10:42 Done here and elsewhere.
+ 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,6 +50,11 @@ 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);
sky 2013/06/07 04:57:25 Same thing about const ui::Event* here (casting aw
+ 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);
@@ -99,4 +111,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

Powered by Google App Engine
This is Rietveld 408576698