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

Unified Diff: chrome/browser/extensions/api/context_menus/context_menus_api_helpers.h

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header Created 4 years, 8 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
Index: chrome/browser/extensions/api/context_menus/context_menus_api_helpers.h
diff --git a/chrome/browser/extensions/api/context_menus/context_menus_api_helpers.h b/chrome/browser/extensions/api/context_menus/context_menus_api_helpers.h
index 3d7bcb8db1b5aef09d26f8a8b4758fdb22f1e0ac..29f2f17d875528ec990c051d76ac0f46355d4665 100644
--- a/chrome/browser/extensions/api/context_menus/context_menus_api_helpers.h
+++ b/chrome/browser/extensions/api/context_menus/context_menus_api_helpers.h
@@ -19,14 +19,14 @@ namespace context_menus_api_helpers {
namespace {
template <typename PropertyWithEnumT>
-scoped_ptr<extensions::MenuItem::Id> GetParentId(
+std::unique_ptr<extensions::MenuItem::Id> GetParentId(
const PropertyWithEnumT& property,
bool is_off_the_record,
const MenuItem::ExtensionKey& key) {
if (!property.parent_id)
- return scoped_ptr<extensions::MenuItem::Id>();
+ return std::unique_ptr<extensions::MenuItem::Id>();
- scoped_ptr<extensions::MenuItem::Id> parent_id(
+ std::unique_ptr<extensions::MenuItem::Id> parent_id(
new extensions::MenuItem::Id(is_off_the_record, key));
if (property.parent_id->as_integer)
parent_id->uid = *property.parent_id->as_integer;
@@ -128,7 +128,7 @@ bool CreateMenuItem(const PropertyWithEnumT& create_properties,
if (create_properties.enabled.get())
enabled = *create_properties.enabled;
- scoped_ptr<MenuItem> item(
+ std::unique_ptr<MenuItem> item(
new MenuItem(item_id, title, checked, enabled, type, contexts));
// URL Patterns.
@@ -141,7 +141,7 @@ bool CreateMenuItem(const PropertyWithEnumT& create_properties,
// Parent id.
bool success = true;
- scoped_ptr<MenuItem::Id> parent_id(GetParentId(
+ std::unique_ptr<MenuItem::Id> parent_id(GetParentId(
create_properties, profile->IsOffTheRecord(), item_id.extension_key));
if (parent_id.get()) {
MenuItem* parent = GetParent(*parent_id, menu_manager, error);
@@ -237,7 +237,7 @@ bool UpdateMenuItem(const PropertyWithEnumT& update_properties,
// Parent id.
MenuItem* parent = NULL;
- scoped_ptr<MenuItem::Id> parent_id(GetParentId(
+ std::unique_ptr<MenuItem::Id> parent_id(GetParentId(
update_properties, profile->IsOffTheRecord(), item_id.extension_key));
if (parent_id.get()) {
MenuItem* parent = GetParent(*parent_id, menu_manager, error);
« no previous file with comments | « chrome/browser/extensions/api/context_menus/context_menus_api.cc ('k') | chrome/browser/extensions/api/cookies/cookies_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698