summaryrefslogtreecommitdiffstats
path: root/extensions/common/extension_builder.h
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/common/extension_builder.h')
-rw-r--r--extensions/common/extension_builder.h9
1 files changed, 3 insertions, 6 deletions
diff --git a/extensions/common/extension_builder.h b/extensions/common/extension_builder.h
index 4734baa..5fe9801 100644
--- a/extensions/common/extension_builder.h
+++ b/extensions/common/extension_builder.h
@@ -40,13 +40,10 @@ class ExtensionBuilder {
ExtensionBuilder& SetLocation(Manifest::Location location);
ExtensionBuilder& SetManifest(scoped_ptr<base::DictionaryValue> manifest);
- ExtensionBuilder& SetManifest(DictionaryBuilder manifest_builder) {
- return SetManifest(manifest_builder.Build());
- }
- // Adds the keys from the DictionaryBuilder to the manifest, with new keys
- // taking precedence.
- ExtensionBuilder& MergeManifest(DictionaryBuilder& builder);
+ // Merge another manifest into the current manifest, with new keys taking
+ // precedence.
+ ExtensionBuilder& MergeManifest(scoped_ptr<base::DictionaryValue> manifest);
ExtensionBuilder& AddFlags(int init_from_value_flags);