diff options
| author | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 18:53:42 +0000 |
|---|---|---|
| committer | rdevlin.cronin@chromium.org <rdevlin.cronin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-25 18:53:42 +0000 |
| commit | 5071e11633dfd70c4596ecbb6d4a25054032b0d2 (patch) | |
| tree | feecb2d939f103637963df59ed4ca1890716f99f /ui/views/controls/menu/menu_runner_impl.cc | |
| parent | 7cf82869a2dcd7e80187732d81c2d6043481aa3e (diff) | |
| download | chromium_src-5071e11633dfd70c4596ecbb6d4a25054032b0d2.zip chromium_src-5071e11633dfd70c4596ecbb6d4a25054032b0d2.tar.gz chromium_src-5071e11633dfd70c4596ecbb6d4a25054032b0d2.tar.bz2 | |
Resubmit: Open the WrenchMenu on mouseover when dragging a browser action
Original Patch: https://codereview.chromium.org/399143004
Reverted In: https://codereview.chromium.org/416903002/
This was reverted because the test was flaky on Vista. Resubmit with a fix.
------------------------
Open the WrenchMenu on mouseover when dragging a browser action
Enable dragging from the main container to the overflow container by opening the
wrench menu when hovering over the button while dragging a browser action. This
also requires keeping the menu open while the drag is happening.
Note: this doesn't fix drag calculations for the overflow menu.
In an effort to keep these patches small, that will come later.
BUG=393038
Review URL: https://codereview.chromium.org/413323002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@285634 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/controls/menu/menu_runner_impl.cc')
| -rw-r--r-- | ui/views/controls/menu/menu_runner_impl.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/views/controls/menu/menu_runner_impl.cc b/ui/views/controls/menu/menu_runner_impl.cc index 9fda83d..4167be997 100644 --- a/ui/views/controls/menu/menu_runner_impl.cc +++ b/ui/views/controls/menu/menu_runner_impl.cc @@ -105,8 +105,7 @@ MenuRunner::RunResult MenuRunnerImpl::RunMenuAt(Widget* parent, running_ = true; for_drop_ = (run_types & MenuRunner::FOR_DROP) != 0; - bool has_mnemonics = - (run_types & MenuRunner::HAS_MNEMONICS) != 0 && !for_drop_; + bool has_mnemonics = (run_types & MenuRunner::HAS_MNEMONICS) != 0; owns_controller_ = false; if (!controller) { // No menus are showing, show one. @@ -131,6 +130,7 @@ MenuRunner::RunResult MenuRunnerImpl::RunMenuAt(Widget* parent, 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(); |