summaryrefslogtreecommitdiffstats
path: root/views/controls
diff options
context:
space:
mode:
authorrhashimoto@chromium.org <rhashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-10 16:48:49 +0000
committerrhashimoto@chromium.org <rhashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-10 16:48:49 +0000
commitee69a2ec9925c2050ede596a06c4f04b9cd914eb (patch)
tree1d1fe2c8d1e511a505fd077476df8643afc08085 /views/controls
parent2d14b373ac9ef900b12160ba64bafdcc0530f1dc (diff)
downloadchromium_src-ee69a2ec9925c2050ede596a06c4f04b9cd914eb.zip
chromium_src-ee69a2ec9925c2050ede596a06c4f04b9cd914eb.tar.gz
chromium_src-ee69a2ec9925c2050ede596a06c4f04b9cd914eb.tar.bz2
Fix leak of EmptyMenuMenuItem.
RemoveChildViewAt() was called on SubmenuView but the child was not deleted. BUG=none TEST=none Review URL: http://codereview.chromium.org/6932052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@84796 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
-rw-r--r--views/controls/menu/menu_item_view.cc2
1 files changed, 2 insertions, 0 deletions
diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc
index 8c2858a8..2d49c8f 100644
--- a/views/controls/menu/menu_item_view.cc
+++ b/views/controls/menu/menu_item_view.cc
@@ -616,6 +616,8 @@ void MenuItemView::RemoveEmptyMenus() {
menu_item->RemoveEmptyMenus();
} else if (child->GetID() == EmptyMenuMenuItem::kEmptyMenuItemViewID) {
submenu_->RemoveChildView(child);
+ delete child;
+ child = NULL;
}
}
}