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

Unified Diff: chrome/browser/ui/views/tabs/tab_strip.cc

Issue 11280290: events: Change gesture-event handler in EventHandler to not return any values. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years 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 871f843f695ed2606d8be327dfbc7e171c62f0d3..862362432beb593b6c39b951857f04df9319b364 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -307,7 +307,7 @@ class NewTabButton : public views::ImageButton {
virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
// Overridden from ui::EventHandler:
- virtual ui::EventResult OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
+ virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
private:
bool ShouldUseNativeFrame() const;
@@ -380,11 +380,11 @@ void NewTabButton::OnPaint(gfx::Canvas* canvas) {
canvas->DrawImageInt(image, 0, height() - image.height());
}
-ui::EventResult NewTabButton::OnGestureEvent(ui::GestureEvent* event) {
+void NewTabButton::OnGestureEvent(ui::GestureEvent* event) {
// Consume all gesture events here so that the parent (Tab) does not
// start consuming gestures.
views::ImageButton::OnGestureEvent(event);
- return ui::ER_CONSUMED;
+ event->SetHandled();
}
bool NewTabButton::ShouldUseNativeFrame() const {
@@ -1463,7 +1463,7 @@ void TabStrip::OnMouseEntered(const ui::MouseEvent& event) {
SetResetToShrinkOnExit(true);
}
-ui::EventResult TabStrip::OnGestureEvent(ui::GestureEvent* event) {
+void TabStrip::OnGestureEvent(ui::GestureEvent* event) {
SetResetToShrinkOnExit(false);
switch (event->type()) {
case ui::ET_GESTURE_END:
@@ -1490,7 +1490,7 @@ ui::EventResult TabStrip::OnGestureEvent(ui::GestureEvent* event) {
default:
break;
}
- return ui::ER_CONSUMED;
+ event->SetHandled();
}
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