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

Unified Diff: ui/events/events_stub.cc

Issue 1287103004: Sync ui/events to chromium @ https://codereview.chromium.org/1210203002 (Closed) Base URL: https://github.com/domokit/mojo.git@master
Patch Set: rebased Created 5 years, 4 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
« no previous file with comments | « ui/events/event_utils.cc ('k') | ui/events/events_unittests.isolate » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/events/events_stub.cc
diff --git a/ui/events/platform/platform_event_stub.cc b/ui/events/events_stub.cc
similarity index 88%
rename from ui/events/platform/platform_event_stub.cc
rename to ui/events/events_stub.cc
index 66830c5137d594c3827d68f8718ecde260aa4562..99fdf2237603c5c5ed6a21d27265abb98141d48f 100644
--- a/ui/events/platform/platform_event_stub.cc
+++ b/ui/events/events_stub.cc
@@ -5,11 +5,10 @@
#include "base/logging.h"
#include "base/time/time.h"
#include "build/build_config.h"
-#include "ui/events/event_constants.h"
#include "ui/events/event_utils.h"
-#include "ui/events/keycodes/keyboard_codes.h"
-#include "ui/gfx/point.h"
-#include "ui/gfx/vector2d.h"
+#include "ui/events/keycodes/dom/dom_code.h"
+#include "ui/gfx/geometry/point.h"
+#include "ui/gfx/geometry/vector2d.h"
namespace ui {
@@ -62,8 +61,13 @@ gfx::Vector2d GetMouseWheelOffset(const base::NativeEvent& native_event) {
return gfx::Vector2d();
}
-void IncrementTouchIdRefCount(const base::NativeEvent& native_event) {
- NOTIMPLEMENTED();
+base::NativeEvent CopyNativeEvent(const base::NativeEvent& event) {
+ NOTIMPLEMENTED() <<
+ "Don't know how to copy base::NativeEvent for this platform";
+ return NULL;
+}
+
+void ReleaseCopiedNativeEvent(const base::NativeEvent& event) {
}
void ClearTouchIdIfReleased(const base::NativeEvent& native_event) {
@@ -120,9 +124,9 @@ KeyboardCode KeyboardCodeFromNative(const base::NativeEvent& native_event) {
return static_cast<KeyboardCode>(0);
}
-const char* CodeFromNative(const base::NativeEvent& native_event) {
+DomCode CodeFromNative(const base::NativeEvent& native_event) {
NOTIMPLEMENTED();
- return "";
+ return DomCode::NONE;
}
uint32 PlatformKeycodeFromNative(const base::NativeEvent& native_event) {
« no previous file with comments | « ui/events/event_utils.cc ('k') | ui/events/events_unittests.isolate » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698