Remove ScopedVector from/extenisons part#2
C++ 11 enables containers that contain move-only type, scoped_ptr.
So, Use std::vector<scoped_ptr<Foo>> instead of ScopedVector.
BUG=554289
Review URL: https://codereview.chromium.org/1503223004
Cr-Commit-Position: refs/heads/master@{#365155}
diff --git a/chrome/browser/extensions/context_menu_matcher.cc b/chrome/browser/extensions/context_menu_matcher.cc
index 8381ce6..24aceca 100644
--- a/chrome/browser/extensions/context_menu_matcher.cc
+++ b/chrome/browser/extensions/context_menu_matcher.cc
@@ -113,13 +113,10 @@
menu_model_->AddItem(menu_id, title);
} else {
ui::SimpleMenuModel* submenu = new ui::SimpleMenuModel(delegate_);
- extension_menu_models_.push_back(submenu);
+ extension_menu_models_.push_back(make_scoped_ptr(submenu));
menu_model_->AddSubMenu(menu_id, title, submenu);
- RecursivelyAppendExtensionItems(submenu_items,
- can_cross_incognito,
- selection_text,
- submenu,
- index,
+ RecursivelyAppendExtensionItems(submenu_items, can_cross_incognito,
+ selection_text, submenu, index,
false); // is_action_menu_top_level
}
if (!is_action_menu)
@@ -266,13 +263,10 @@
menu_model->AddItem(menu_id, title);
} else {
ui::SimpleMenuModel* submenu = new ui::SimpleMenuModel(delegate_);
- extension_menu_models_.push_back(submenu);
+ extension_menu_models_.push_back(make_scoped_ptr(submenu));
menu_model->AddSubMenu(menu_id, title, submenu);
- RecursivelyAppendExtensionItems(children,
- can_cross_incognito,
- selection_text,
- submenu,
- index,
+ RecursivelyAppendExtensionItems(children, can_cross_incognito,
+ selection_text, submenu, index,
false); // is_action_menu_top_level
}
} else if (item->type() == MenuItem::CHECKBOX) {
