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

Unified Diff: ui/events/android/motion_event_android.h

Issue 1430623004: blimp: Add support for input handling (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 2 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/events/android/motion_event_android.h
diff --git a/content/browser/renderer_host/input/motion_event_android.h b/ui/events/android/motion_event_android.h
similarity index 93%
rename from content/browser/renderer_host/input/motion_event_android.h
rename to ui/events/android/motion_event_android.h
index bf4dfed040ecc3be707a4273d0f88b1f056df430..ce4c3e4e026fe006d90947cec9661d51409ed38d 100644
--- a/content/browser/renderer_host/input/motion_event_android.h
+++ b/ui/events/android/motion_event_android.h
@@ -3,24 +3,25 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_
-#define CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_
+#ifndef UI_EVENTS_ANDROID_MOTION_EVENT_ANDROID_H_
+#define UI_EVENTS_ANDROID_MOTION_EVENT_ANDROID_H_
#include <jni.h>
#include "base/android/scoped_java_ref.h"
+#include "base/macros.h"
#include "base/memory/scoped_ptr.h"
#include "base/time/time.h"
-#include "content/common/content_export.h"
-#include "ui/events/gesture_detection/motion_event.h"
#include "ui/gfx/geometry/point_f.h"
+#include "ui/events/events_export.h"
+#include "ui/events/gesture_detection/motion_event.h"
-namespace content {
+namespace ui {
// Implementation of ui::MotionEvent wrapping a native Android MotionEvent.
// All *input* coordinates are in device pixels (as with Android MotionEvent),
// while all *output* coordinates are in DIPs (as with WebTouchEvent).
-class CONTENT_EXPORT MotionEventAndroid : public ui::MotionEvent {
+class EVENTS_EXPORT MotionEventAndroid : public MotionEvent {
public:
struct Pointer {
Pointer(jint id,
@@ -131,4 +132,4 @@ class CONTENT_EXPORT MotionEventAndroid : public ui::MotionEvent {
} // namespace content
-#endif // CONTENT_BROWSER_RENDERER_HOST_INPUT_MOTION_EVENT_ANDROID_H_
+#endif // UI_EVENTS_ANDROID_MOTION_EVENT_ANDROID_H_

Powered by Google App Engine
This is Rietveld 408576698