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

Unified Diff: extensions/common/manifest.cc

Issue 1908953003: Convert //extensions/{common,shell} from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase? 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
« no previous file with comments | « extensions/common/manifest.h ('k') | extensions/common/manifest_handler_helpers.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/manifest.cc
diff --git a/extensions/common/manifest.cc b/extensions/common/manifest.cc
index 8bc2e28ea858531a5a091f7ecc89e97bf0581793..c2e608fc32aeb596daa9a76ad2e81f718f7df5cf 100644
--- a/extensions/common/manifest.cc
+++ b/extensions/common/manifest.cc
@@ -109,7 +109,8 @@ Manifest::Location Manifest::GetHigherPriorityLocation(
return (loc1_rank > loc2_rank ? loc1 : loc2 );
}
-Manifest::Manifest(Location location, scoped_ptr<base::DictionaryValue> value)
+Manifest::Manifest(Location location,
+ std::unique_ptr<base::DictionaryValue> value)
: location_(location), value_(std::move(value)), type_(TYPE_UNKNOWN) {
if (value_->HasKey(keys::kTheme)) {
type_ = TYPE_THEME;
@@ -216,7 +217,7 @@ bool Manifest::GetList(
Manifest* Manifest::DeepCopy() const {
Manifest* manifest = new Manifest(
- location_, scoped_ptr<base::DictionaryValue>(value_->DeepCopy()));
+ location_, std::unique_ptr<base::DictionaryValue>(value_->DeepCopy()));
manifest->set_extension_id(extension_id_);
return manifest;
}
« no previous file with comments | « extensions/common/manifest.h ('k') | extensions/common/manifest_handler_helpers.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698