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

Unified Diff: ui/aura/shared/compound_event_filter.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/root_window_unittest.cc ('k') | ui/aura/shared/compound_event_filter.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/shared/compound_event_filter.h
diff --git a/ui/aura/shared/compound_event_filter.h b/ui/aura/shared/compound_event_filter.h
index c5a5e833095b355f1384ce72f7480c0f5a65ce67..def8007fcba1adc61e6dbc2eea49d517e109241d 100644
--- a/ui/aura/shared/compound_event_filter.h
+++ b/ui/aura/shared/compound_event_filter.h
@@ -15,7 +15,7 @@ class GestureEventImpl;
class KeyEvent;
class LocatedEvent;
class MouseEvent;
-class TouchEventImpl;
+class TouchEvent;
}
namespace aura {
@@ -56,7 +56,7 @@ class AURA_EXPORT CompoundEventFilter : public EventFilter {
ui::MouseEvent* event) OVERRIDE;
virtual ui::TouchStatus PreHandleTouchEvent(
Window* target,
- ui::TouchEventImpl* event) OVERRIDE;
+ ui::TouchEvent* event) OVERRIDE;
virtual ui::GestureStatus PreHandleGestureEvent(
Window* target,
ui::GestureEventImpl* event) OVERRIDE;
@@ -70,7 +70,7 @@ class AURA_EXPORT CompoundEventFilter : public EventFilter {
// ui::TOUCH_STATUS_UNKNOWN if event is consumed.
bool FilterKeyEvent(Window* target, ui::KeyEvent* event);
bool FilterMouseEvent(Window* target, ui::MouseEvent* event);
- ui::TouchStatus FilterTouchEvent(Window* target, ui::TouchEventImpl* event);
+ ui::TouchStatus FilterTouchEvent(Window* target, ui::TouchEvent* event);
// Sets the visibility of the cursor if the event is not synthesized and
// |update_cursor_visibility_| is true.
« no previous file with comments | « ui/aura/root_window_unittest.cc ('k') | ui/aura/shared/compound_event_filter.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698