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

Unified Diff: extensions/common/extension_builder.h

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/extension_api.cc ('k') | extensions/common/extension_builder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/extension_builder.h
diff --git a/extensions/common/extension_builder.h b/extensions/common/extension_builder.h
index 5fe9801a6024f7985285ec57e7ff529a33558316..c6d5ab6e20b45e21a5b8a4847e3adbf3d3adbe36 100644
--- a/extensions/common/extension_builder.h
+++ b/extensions/common/extension_builder.h
@@ -5,12 +5,12 @@
#ifndef EXTENSIONS_COMMON_EXTENSION_BUILDER_H_
#define EXTENSIONS_COMMON_EXTENSION_BUILDER_H_
+#include <memory>
#include <string>
#include "base/files/file_path.h"
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "extensions/common/manifest.h"
#include "extensions/common/value_builder.h"
@@ -39,11 +39,13 @@ class ExtensionBuilder {
// Defaults to Manifest::UNPACKED.
ExtensionBuilder& SetLocation(Manifest::Location location);
- ExtensionBuilder& SetManifest(scoped_ptr<base::DictionaryValue> manifest);
+ ExtensionBuilder& SetManifest(
+ std::unique_ptr<base::DictionaryValue> manifest);
// Merge another manifest into the current manifest, with new keys taking
// precedence.
- ExtensionBuilder& MergeManifest(scoped_ptr<base::DictionaryValue> manifest);
+ ExtensionBuilder& MergeManifest(
+ std::unique_ptr<base::DictionaryValue> manifest);
ExtensionBuilder& AddFlags(int init_from_value_flags);
@@ -53,7 +55,7 @@ class ExtensionBuilder {
private:
base::FilePath path_;
Manifest::Location location_;
- scoped_ptr<base::DictionaryValue> manifest_;
+ std::unique_ptr<base::DictionaryValue> manifest_;
int flags_;
std::string id_;
« no previous file with comments | « extensions/common/extension_api.cc ('k') | extensions/common/extension_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698