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

Unified Diff: ash/launcher/launcher_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/launcher/launcher_button.h ('k') | ash/launcher/launcher_tooltip_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/launcher/launcher_button.cc
diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc
index dfbeb4c9b0577dc5a9b8b99283a8433ac067085b..d9a2583e66aea34d46202a76ca82e49c570c39f9 100644
--- a/ash/launcher/launcher_button.cc
+++ b/ash/launcher/launcher_button.cc
@@ -258,7 +258,7 @@ void LauncherButton::OnMouseExited(const ui::MouseEvent& event) {
host_->MouseExitedButton(this);
}
-ui::GestureStatus LauncherButton::OnGestureEvent(
+ui::EventResult LauncherButton::OnGestureEvent(
const ui::GestureEvent& event) {
switch (event.type()) {
case ui::ET_GESTURE_TAP_DOWN:
@@ -269,13 +269,13 @@ ui::GestureStatus LauncherButton::OnGestureEvent(
return CustomButton::OnGestureEvent(event);
case ui::ET_GESTURE_SCROLL_BEGIN:
host_->PointerPressedOnButton(this, LauncherButtonHost::TOUCH, event);
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
case ui::ET_GESTURE_SCROLL_UPDATE:
host_->PointerDraggedOnButton(this, LauncherButtonHost::TOUCH, event);
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
case ui::ET_GESTURE_SCROLL_END:
host_->PointerReleasedOnButton(this, LauncherButtonHost::TOUCH, false);
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
default:
return CustomButton::OnGestureEvent(event);
}
« no previous file with comments | « ash/launcher/launcher_button.h ('k') | ash/launcher/launcher_tooltip_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698