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

Unified Diff: ash/wm/workspace/frame_maximize_button.cc

Issue 10912063: events: Get rid of GestureStatus in favour of EventResult. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 3 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 | « ash/wm/workspace/frame_maximize_button.h ('k') | ash/wm/workspace/workspace_event_filter.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/workspace/frame_maximize_button.cc
diff --git a/ash/wm/workspace/frame_maximize_button.cc b/ash/wm/workspace/frame_maximize_button.cc
index 6b4a572383c587a141fa802f7d98f7b343cf06ac..2d08e9282852300e50fb9b57f87b1634c2a0e7af 100644
--- a/ash/wm/workspace/frame_maximize_button.cc
+++ b/ash/wm/workspace/frame_maximize_button.cc
@@ -55,7 +55,7 @@ class FrameMaximizeButton::EscapeEventFilter : public aura::EventFilter {
virtual ui::TouchStatus PreHandleTouchEvent(
aura::Window* target,
ui::TouchEvent* event) OVERRIDE;
- virtual ui::GestureStatus PreHandleGestureEvent(
+ virtual ui::EventResult PreHandleGestureEvent(
aura::Window* target,
ui::GestureEvent* event) OVERRIDE;
@@ -97,10 +97,10 @@ ui::TouchStatus FrameMaximizeButton::EscapeEventFilter::PreHandleTouchEvent(
return ui::TOUCH_STATUS_UNKNOWN;
}
-ui::GestureStatus FrameMaximizeButton::EscapeEventFilter::PreHandleGestureEvent(
+ui::EventResult FrameMaximizeButton::EscapeEventFilter::PreHandleGestureEvent(
aura::Window* target,
ui::GestureEvent* event) {
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
}
// FrameMaximizeButton ---------------------------------------------------------
@@ -259,12 +259,12 @@ void FrameMaximizeButton::OnMouseCaptureLost() {
ImageButton::OnMouseCaptureLost();
}
-ui::GestureStatus FrameMaximizeButton::OnGestureEvent(
+ui::EventResult FrameMaximizeButton::OnGestureEvent(
const ui::GestureEvent& event) {
if (event.type() == ui::ET_GESTURE_TAP_DOWN) {
is_snap_enabled_ = true;
ProcessStartEvent(event);
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
if (event.type() == ui::ET_GESTURE_TAP ||
@@ -276,7 +276,7 @@ ui::GestureStatus FrameMaximizeButton::OnGestureEvent(
if (event.type() == ui::ET_GESTURE_TAP)
snap_type_ = SnapTypeForLocation(event.location());
ProcessEndEvent(event);
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
if (is_snap_enabled_) {
@@ -287,13 +287,13 @@ ui::GestureStatus FrameMaximizeButton::OnGestureEvent(
ProcessUpdateEvent(event);
snap_type_ = SnapTypeForLocation(event.location());
ProcessEndEvent(event);
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
if (event.type() == ui::ET_GESTURE_SCROLL_UPDATE ||
event.type() == ui::ET_GESTURE_SCROLL_BEGIN) {
ProcessUpdateEvent(event);
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
}
« no previous file with comments | « ash/wm/workspace/frame_maximize_button.h ('k') | ash/wm/workspace/workspace_event_filter.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698