ui/views/controls/button/menu_button.cc - Issue 10824295: Rid the world of the last of views::Event types: TouchEvent, GestureEvent, MouseWheelEvent, ScrollE…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/views/controls/button/menu_button.cc

Issue 10824295: Rid the world of the last of views::Event types: TouchEvent, GestureEvent, MouseWheelEvent, ScrollE… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years, 4 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: ui/views/controls/button/menu_button.cc

===================================================================

--- ui/views/controls/button/menu_button.cc (revision 151481)

+++ ui/views/controls/button/menu_button.cc (working copy)

@@ -18,7 +18,6 @@

#include "ui/gfx/screen.h"

#include "ui/views/controls/button/button.h"

#include "ui/views/controls/button/menu_button_listener.h"

-#include "ui/views/events/event.h"

#include "ui/views/widget/root_view.h"

#include "ui/views/widget/widget.h"

@@ -220,7 +219,7 @@

}

-ui::GestureStatus MenuButton::OnGestureEvent(const GestureEvent& event) {

+ui::GestureStatus MenuButton::OnGestureEvent(const ui::GestureEvent& event) {

if (state() != BS_DISABLED && event.type() == ui::ET_GESTURE_TAP) {

if (Activate())

return ui::GESTURE_STATUS_CONSUMED;

« no previous file with comments | « ui/views/controls/button/menu_button.h ('k') | ui/views/controls/button/text_button.cc » ('j') | no next file with comments »