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

Unified Diff: trunk/src/ui/views/controls/menu/menu_runner_impl.cc

Issue 416903002: Revert 285142 "Open the WrenchMenu on mouseover when dragging a ..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 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 | « trunk/src/ui/views/controls/menu/menu_runner.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/ui/views/controls/menu/menu_runner_impl.cc
===================================================================
--- trunk/src/ui/views/controls/menu/menu_runner_impl.cc (revision 285300)
+++ trunk/src/ui/views/controls/menu/menu_runner_impl.cc (working copy)
@@ -105,7 +105,8 @@
running_ = true;
for_drop_ = (run_types & MenuRunner::FOR_DROP) != 0;
- bool has_mnemonics = (run_types & MenuRunner::HAS_MNEMONICS) != 0;
+ bool has_mnemonics =
+ (run_types & MenuRunner::HAS_MNEMONICS) != 0 && !for_drop_;
owns_controller_ = false;
if (!controller) {
// No menus are showing, show one.
@@ -130,7 +131,6 @@
bounds,
anchor,
(run_types & MenuRunner::CONTEXT_MENU) != 0,
- (run_types & MenuRunner::NESTED_DRAG) != 0,
&mouse_event_flags);
// Get the time of the event which closed this menu.
closing_event_time_ = controller->closing_event_time();
« no previous file with comments | « trunk/src/ui/views/controls/menu/menu_runner.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698