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

Unified Diff: ui/views/controls/menu/menu_item_view.cc

Issue 2445513002: Remove stl_util's deletion function use from ui/views/. (Closed)
Patch Set: drop Created 4 years, 2 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 | « no previous file | ui/views/controls/menu/native_menu_win.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_item_view.cc
diff --git a/ui/views/controls/menu/menu_item_view.cc b/ui/views/controls/menu/menu_item_view.cc
index 73fc3039650a4d38bd2908439eb40707aa0585c9..2107c9a328f7fae7d2fe4ded89c7e2fb98ee75ba 100644
--- a/ui/views/controls/menu/menu_item_view.cc
+++ b/ui/views/controls/menu/menu_item_view.cc
@@ -8,7 +8,6 @@
#include "base/i18n/case_conversion.h"
#include "base/macros.h"
-#include "base/stl_util.h"
#include "base/strings/utf_string_conversions.h"
#include "ui/accessibility/ax_view_state.h"
#include "ui/base/l10n/l10n_util.h"
@@ -525,7 +524,9 @@ void MenuItemView::ChildrenChanged() {
}
}
- base::STLDeleteElements(&removed_items_);
+ for (auto item : removed_items_)
+ delete item;
+ removed_items_.clear();
}
void MenuItemView::Layout() {
@@ -598,7 +599,8 @@ MenuItemView::MenuItemView(MenuItemView* parent,
MenuItemView::~MenuItemView() {
delete submenu_;
- base::STLDeleteElements(&removed_items_);
+ for (auto item : removed_items_)
+ delete item;
}
const char* MenuItemView::GetClassName() const {
« no previous file with comments | « no previous file | ui/views/controls/menu/native_menu_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698