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

Unified Diff: chrome/browser/ui/views/tabs/tab_strip.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
Index: chrome/browser/ui/views/tabs/tab_strip.cc
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
index 387cdf0e5dd57cdcc408588fa458b788ab0b712e..053b6a84602d2e54d550910f6de3fcab738333b3 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -305,7 +305,7 @@ class NewTabButton : public views::ImageButton {
#if defined(OS_WIN) && !defined(USE_AURA)
void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
#endif
- virtual ui::GestureStatus OnGestureEvent(
+ virtual ui::EventResult OnGestureEvent(
const ui::GestureEvent& event) OVERRIDE;
void OnPaint(gfx::Canvas* canvas) OVERRIDE;
@@ -374,12 +374,12 @@ void NewTabButton::OnMouseReleased(const ui::MouseEvent& event) {
}
#endif
-ui::GestureStatus NewTabButton::OnGestureEvent(
+ui::EventResult NewTabButton::OnGestureEvent(
const ui::GestureEvent& event) {
// Consume all gesture events here so that the parent (BaseTab) does not
// start consuming gestures.
views::ImageButton::OnGestureEvent(event);
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
void NewTabButton::OnPaint(gfx::Canvas* canvas) {
@@ -1433,7 +1433,7 @@ void TabStrip::OnMouseEntered(const ui::MouseEvent& event) {
SetResetToShrinkOnExit(true);
}
-ui::GestureStatus TabStrip::OnGestureEvent(
+ui::EventResult TabStrip::OnGestureEvent(
const ui::GestureEvent& event) {
SetResetToShrinkOnExit(false);
switch (event.type()) {
@@ -1461,7 +1461,7 @@ ui::GestureStatus TabStrip::OnGestureEvent(
default:
break;
}
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
void TabStrip::GetCurrentTabWidths(double* unselected_width,
« no previous file with comments | « chrome/browser/ui/views/tabs/tab_strip.h ('k') | content/browser/renderer_host/render_widget_host_view_aura.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698