diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 17:02:30 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-12 17:02:30 +0000 |
| commit | 937f78e6c9fa1336ab0d0b379df5318d02679367 (patch) | |
| tree | 9df25535786f7e30a7f57aa8a36a9026b9985e4f /views/controls | |
| parent | 548b98ca60e932111e3e969933fd4d67db3692c6 (diff) | |
| download | chromium_src-937f78e6c9fa1336ab0d0b379df5318d02679367.zip chromium_src-937f78e6c9fa1336ab0d0b379df5318d02679367.tar.gz chromium_src-937f78e6c9fa1336ab0d0b379df5318d02679367.tar.bz2 | |
Fixes crash when dropping on a menu showing the 'emtpy' menu item.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: http://codereview.chromium.org/7313038
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92184 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/menu/menu_controller.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/views/controls/menu/menu_controller.cc b/views/controls/menu/menu_controller.cc index 31726f1..d5e3305 100644 --- a/views/controls/menu/menu_controller.cc +++ b/views/controls/menu/menu_controller.cc @@ -708,15 +708,15 @@ int MenuController::OnPerformDrop(SubmenuView* source, showing_ = false; exit_type_ = EXIT_ALL; + // If over an empty menu item, drop occurs on the parent. + if (drop_target->id() == MenuItemView::kEmptyMenuItemViewID) + drop_target = drop_target->GetParentMenuItem(); + if (!IsBlockingRun()) item->GetRootMenuItem()->DropMenuClosed(false); // WARNING: the call to MenuClosed deletes us. - // If over an empty menu item, drop occurs on the parent. - if (drop_target->id() == MenuItemView::kEmptyMenuItemViewID) - drop_target = drop_target->GetParentMenuItem(); - return drop_target->GetDelegate()->OnPerformDrop( drop_target, drop_position, event); } |