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

Unified Diff: ui/aura/shared/compound_event_filter.cc

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/shared/compound_event_filter.h ('k') | ui/aura/shared/compound_event_filter_unittest.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.cc
diff --git a/ui/aura/shared/compound_event_filter.cc b/ui/aura/shared/compound_event_filter.cc
index 60c48fa973773b3753afb9ba5ed041c2b14fa28a..08cdb51cd8e9f73e11011bfe2a1812a0b8e95cf6 100644
--- a/ui/aura/shared/compound_event_filter.cc
+++ b/ui/aura/shared/compound_event_filter.cc
@@ -124,7 +124,7 @@ bool CompoundEventFilter::PreHandleMouseEvent(Window* target,
ui::TouchStatus CompoundEventFilter::PreHandleTouchEvent(
Window* target,
- ui::TouchEventImpl* event) {
+ ui::TouchEvent* event) {
ui::TouchStatus status = FilterTouchEvent(target, event);
if (status == ui::TOUCH_STATUS_UNKNOWN &&
event->type() == ui::ET_TOUCH_PRESSED) {
@@ -200,7 +200,7 @@ bool CompoundEventFilter::FilterMouseEvent(Window* target,
ui::TouchStatus CompoundEventFilter::FilterTouchEvent(
Window* target,
- ui::TouchEventImpl* event) {
+ ui::TouchEvent* event) {
ui::TouchStatus status = ui::TOUCH_STATUS_UNKNOWN;
if (filters_.might_have_observers()) {
ObserverListBase<EventFilter>::Iterator it(filters_);
« no previous file with comments | « ui/aura/shared/compound_event_filter.h ('k') | ui/aura/shared/compound_event_filter_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698