summaryrefslogtreecommitdiffstats
path: root/extensions/common/extension_builder.cc
diff options
context:
space:
mode:
Diffstat (limited to 'extensions/common/extension_builder.cc')
-rw-r--r--extensions/common/extension_builder.cc5
1 files changed, 3 insertions, 2 deletions
diff --git a/extensions/common/extension_builder.cc b/extensions/common/extension_builder.cc
index 9e41166..905ba6b 100644
--- a/extensions/common/extension_builder.cc
+++ b/extensions/common/extension_builder.cc
@@ -61,8 +61,9 @@ ExtensionBuilder& ExtensionBuilder::SetManifest(
return *this;
}
-ExtensionBuilder& ExtensionBuilder::MergeManifest(DictionaryBuilder& builder) {
- manifest_->MergeDictionary(builder.Build().get());
+ExtensionBuilder& ExtensionBuilder::MergeManifest(
+ scoped_ptr<base::DictionaryValue> manifest) {
+ manifest_->MergeDictionary(manifest.get());
return *this;
}