diff options
| author | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-04 21:11:00 +0000 |
|---|---|---|
| committer | sky@google.com <sky@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-11-04 21:11:00 +0000 |
| commit | 76fefc168e2016322abd1f933935bd222dbf4fd3 (patch) | |
| tree | 4af653c3577b75e005ca0cb6dccc0c068f3df6e5 /chrome | |
| parent | 4441998454cf90328fb3ec1ce49ac98d0127805c (diff) | |
| download | chromium_src-76fefc168e2016322abd1f933935bd222dbf4fd3.zip chromium_src-76fefc168e2016322abd1f933935bd222dbf4fd3.tar.gz chromium_src-76fefc168e2016322abd1f933935bd222dbf4fd3.tar.bz2 | |
My last fix breaks an interative ui test. I'm going to back out until I figure out why.
TBR=ben
Review URL: http://codereview.chromium.org/9353
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@4656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/views/chrome_menu.cc | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/chrome/views/chrome_menu.cc b/chrome/views/chrome_menu.cc index 209e02e..77c33e9 100644 --- a/chrome/views/chrome_menu.cc +++ b/chrome/views/chrome_menu.cc @@ -1070,13 +1070,6 @@ void MenuItemView::RunMenuAt(HWND parent, int mouse_event_flags; MenuController* controller = MenuController::GetActiveInstance(); - if (controller && !controller->IsBlockingRun()) { - // A menu is already showing, but it isn't a blocking menu. Cancel it. - // We can get here during drag and drop if the user right clicks on the - // menu quickly after the drop. - controller->Cancel(true); - controller = NULL; - } bool owns_controller = false; if (!controller) { // No menus are showing, show one. |