diff options
| author | reillyg <reillyg@chromium.org> | 2015-09-10 17:25:54 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-11 00:26:37 +0000 |
| commit | 259c0a3f44bdd8130c5d835e9f596624a079fbd1 (patch) | |
| tree | 8c69523a7745aa71e6d67cdedad5b5ce0336b4a9 /extensions/utility/unpacker.h | |
| parent | 9a1461f5cbacfc7d5c40ac2cd2cc0ec104e9b39c (diff) | |
| download | chromium_src-259c0a3f44bdd8130c5d835e9f596624a079fbd1.zip chromium_src-259c0a3f44bdd8130c5d835e9f596624a079fbd1.tar.gz chromium_src-259c0a3f44bdd8130c5d835e9f596624a079fbd1.tar.bz2 | |
Add scoped_ptr-safe base::Value to Dictionary/List conversion functions.
This change adds two static From() functions to the DictionaryValue and
ListValue classes which take a scoped_ptr to a Value and either convert
it to a scoped_ptr to a DictionaryValue or ListValue, or return nullptr.
These are intended to replace the existing pattern,
make_scoped_ptr(static_cast<base::DictionaryValue*>(value.release()))
with the shorter and safer alternative,
base::DictionaryValue::From(value.Pass())
Instances of this pattern in //extensions have been converted as
examples.
Review URL: https://codereview.chromium.org/1308013005
Cr-Commit-Position: refs/heads/master@{#348294}
Diffstat (limited to 'extensions/utility/unpacker.h')
| -rw-r--r-- | extensions/utility/unpacker.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/extensions/utility/unpacker.h b/extensions/utility/unpacker.h index 7e5a7e4..eaffc7b 100644 --- a/extensions/utility/unpacker.h +++ b/extensions/utility/unpacker.h @@ -55,8 +55,7 @@ class Unpacker { bool DumpMessageCatalogsToFile(); // Parse the manifest.json file inside the extension (not in the header). - // Caller takes ownership of return value. - base::DictionaryValue* ReadManifest(); + scoped_ptr<base::DictionaryValue> ReadManifest(); // Parse all _locales/*/messages.json files inside the extension. bool ReadAllMessageCatalogs(const std::string& default_locale); |