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

Unified Diff: ui/aura/root_window.h

Issue 10831240: Remove TouchEvent interface, and rename TouchEventImpl to TouchEvent (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge-tot Created 8 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/aura/gestures/gesture_recognizer_unittest.cc ('k') | ui/aura/root_window.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window.h
diff --git a/ui/aura/root_window.h b/ui/aura/root_window.h
index 70a77a8bfa4040b74150e7ae5c4ce32c0acccdb3..c44c87977f3377ba90f1142fc5f6c6c22809414d 100644
--- a/ui/aura/root_window.h
+++ b/ui/aura/root_window.h
@@ -37,7 +37,7 @@ class KeyEvent;
class LayerAnimationSequence;
class MouseEvent;
class ScrollEvent;
-class TouchEventImpl;
+class TouchEvent;
class Transform;
}
@@ -271,7 +271,7 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
bool ProcessMouseEvent(Window* target, ui::MouseEvent* event);
bool ProcessKeyEvent(Window* target, ui::KeyEvent* event);
- ui::TouchStatus ProcessTouchEvent(Window* target, ui::TouchEventImpl* event);
+ ui::TouchStatus ProcessTouchEvent(Window* target, ui::TouchEvent* event);
ui::GestureStatus ProcessGestureEvent(Window* target,
ui::GestureEventImpl* event);
bool ProcessGestures(ui::GestureRecognizer::Gestures* gestures);
@@ -314,7 +314,7 @@ class AURA_EXPORT RootWindow : public ui::CompositorDelegate,
virtual bool OnHostKeyEvent(ui::KeyEvent* event) OVERRIDE;
virtual bool OnHostMouseEvent(ui::MouseEvent* event) OVERRIDE;
virtual bool OnHostScrollEvent(ui::ScrollEvent* event) OVERRIDE;
- virtual bool OnHostTouchEvent(ui::TouchEventImpl* event) OVERRIDE;
+ virtual bool OnHostTouchEvent(ui::TouchEvent* event) OVERRIDE;
virtual void OnHostLostCapture() OVERRIDE;
virtual void OnHostPaint() OVERRIDE;
virtual void OnHostResized(const gfx::Size& size) OVERRIDE;
« no previous file with comments | « ui/aura/gestures/gesture_recognizer_unittest.cc ('k') | ui/aura/root_window.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698