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

Unified Diff: ui/views/controls/menu/menu_controller.cc

Issue 10831011: Wrench menu needs to respond to touch events. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_controller.cc
diff --git a/ui/views/controls/menu/menu_controller.cc b/ui/views/controls/menu/menu_controller.cc
index 0ca99f8327ca13f38bfd66d03b3b36687b7a9d75..d5747bd35ed2aebb197151f817d80d76819bf797 100644
--- a/ui/views/controls/menu/menu_controller.cc
+++ b/ui/views/controls/menu/menu_controller.cc
@@ -475,7 +475,7 @@ void MenuController::OnMouseReleased(SubmenuView* source,
// We must ignore the first release event when it occured within the original
// bounds.
- if (drop_first_release_event_ && event.flags() == ui::EF_LEFT_MOUSE_BUTTON) {
+ if (drop_first_release_event_ && (event.flags() & ui::EF_LEFT_MOUSE_BUTTON)) {
drop_first_release_event_ = false;
gfx::Point loc(event.location());
View::ConvertPointToScreen(source->GetScrollViewContainer(), &loc);
@@ -500,7 +500,7 @@ void MenuController::OnMouseReleased(SubmenuView* source,
// contents of the folder.
if (!part.is_scroll() && part.menu &&
!(part.menu->HasSubmenu() &&
- (event.flags() == ui::EF_LEFT_MOUSE_BUTTON))) {
+ (event.flags() & ui::EF_LEFT_MOUSE_BUTTON))) {
if (active_mouse_view_) {
SendMouseReleaseToActiveView(source, event);
return;
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698