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

Unified Diff: extensions/common/file_util.h

Issue 1308013005: Add scoped_ptr-safe base::Value to Dictionary/List conversion functions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Made conversions static members. Created 5 years, 3 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/features/json_feature_provider_source.cc ('k') | extensions/common/file_util.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/common/file_util.h
diff --git a/extensions/common/file_util.h b/extensions/common/file_util.h
index 015039e9e7c5996d00a362fcae45d2266502a944..5bb128746bbae3ffccfc582edc22b4c3b93c4dfe 100644
--- a/extensions/common/file_util.h
+++ b/extensions/common/file_util.h
@@ -59,11 +59,12 @@ scoped_refptr<Extension> LoadExtension(const base::FilePath& extension_root,
// Loads an extension manifest from the specified directory. Returns NULL
// on failure, with a description of the error in |error|.
-base::DictionaryValue* LoadManifest(const base::FilePath& extension_root,
- std::string* error);
+scoped_ptr<base::DictionaryValue> LoadManifest(
+ const base::FilePath& extension_root,
+ std::string* error);
// Convenience overload for specifying a manifest filename.
-base::DictionaryValue* LoadManifest(
+scoped_ptr<base::DictionaryValue> LoadManifest(
const base::FilePath& extension_root,
const base::FilePath::CharType* manifest_filename,
std::string* error);
« no previous file with comments | « extensions/common/features/json_feature_provider_source.cc ('k') | extensions/common/file_util.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698