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

Unified Diff: chrome/browser/ui/views/tabs/base_tab.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 | « chrome/browser/ui/views/tabs/base_tab.h ('k') | chrome/browser/ui/views/tabs/tab_strip.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/tabs/base_tab.cc
diff --git a/chrome/browser/ui/views/tabs/base_tab.cc b/chrome/browser/ui/views/tabs/base_tab.cc
index 4ebda7e24554b2be97945025d00acc828bd86eaa..8995fe6cfc17902b1556fb361d437a7122ff8684 100644
--- a/chrome/browser/ui/views/tabs/base_tab.cc
+++ b/chrome/browser/ui/views/tabs/base_tab.cc
@@ -90,12 +90,12 @@ class BaseTab::TabCloseButton : public views::ImageButton {
CustomButton::OnMouseReleased(event);
}
- virtual ui::GestureStatus OnGestureEvent(
+ virtual ui::EventResult OnGestureEvent(
const ui::GestureEvent& event) OVERRIDE {
// Consume all gesture events here so that the parent (BaseTab) does not
// start consuming gestures.
ImageButton::OnGestureEvent(event);
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
private:
@@ -411,14 +411,14 @@ void BaseTab::OnMouseExited(const ui::MouseEvent& event) {
hover_controller_.Hide();
}
-ui::GestureStatus BaseTab::OnGestureEvent(const ui::GestureEvent& event) {
+ui::EventResult BaseTab::OnGestureEvent(const ui::GestureEvent& event) {
if (!controller())
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
switch (event.type()) {
case ui::ET_GESTURE_BEGIN: {
if (event.details().touch_points() != 1)
- return ui::GESTURE_STATUS_UNKNOWN;
+ return ui::ER_UNHANDLED;
TabStripSelectionModel original_selection;
original_selection.Copy(controller()->GetSelectionModel());
@@ -441,7 +441,7 @@ ui::GestureStatus BaseTab::OnGestureEvent(const ui::GestureEvent& event) {
default:
break;
}
- return ui::GESTURE_STATUS_CONSUMED;
+ return ui::ER_CONSUMED;
}
bool BaseTab::GetTooltipText(const gfx::Point& p, string16* tooltip) const {
« no previous file with comments | « chrome/browser/ui/views/tabs/base_tab.h ('k') | chrome/browser/ui/views/tabs/tab_strip.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698