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

Unified Diff: ash/wm/shelf_layout_manager.cc

Issue 11364062: ui: Remove TouchStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 1 month 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 | « ash/wm/panel_window_event_filter.cc ('k') | ash/wm/system_gesture_event_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/shelf_layout_manager.cc
diff --git a/ash/wm/shelf_layout_manager.cc b/ash/wm/shelf_layout_manager.cc
index fe5c84f71e3331c1c2e47aacd4a8d9204ce65689..29a73b03cd42186834e53cd9ab4528f3250d22a3 100644
--- a/ash/wm/shelf_layout_manager.cc
+++ b/ash/wm/shelf_layout_manager.cc
@@ -78,7 +78,7 @@ class ShelfLayoutManager::AutoHideEventFilter : public aura::EventFilter {
ui::KeyEvent* event) OVERRIDE;
virtual bool PreHandleMouseEvent(aura::Window* target,
ui::MouseEvent* event) OVERRIDE;
- virtual ui::TouchStatus PreHandleTouchEvent(
+ virtual ui::EventResult PreHandleTouchEvent(
aura::Window* target,
ui::TouchEvent* event) OVERRIDE;
virtual ui::EventResult PreHandleGestureEvent(
@@ -123,10 +123,10 @@ bool ShelfLayoutManager::AutoHideEventFilter::PreHandleMouseEvent(
return false; // Not handled.
}
-ui::TouchStatus ShelfLayoutManager::AutoHideEventFilter::PreHandleTouchEvent(
+ui::EventResult ShelfLayoutManager::AutoHideEventFilter::PreHandleTouchEvent(
aura::Window* target,
ui::TouchEvent* event) {
- return ui::TOUCH_STATUS_UNKNOWN; // Not handled.
+ return ui::ER_UNHANDLED; // Not handled.
}
ui::EventResult
« no previous file with comments | « ash/wm/panel_window_event_filter.cc ('k') | ash/wm/system_gesture_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698