Commit c96a5809 authored by girard@chromium.org's avatar girard@chromium.org

Wrench menu needs to respond to touch events.

Touches generate emulated mouse events.  The menu controller was unintentionally
ignoring these events.

BUG=138356
TEST=


Review URL: https://chromiumcodereview.appspot.com/10831011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148767 0039d316-1c4b-4281-b951-d872f2087c98
parent ca148891
......@@ -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;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment