extensions/common/extension_builder.cc - Issue 1739183003: Make extensions::DictionaryBuilder and extensions::ListValue unmovable.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: extensions/common/extension_builder.cc

Issue 1739183003: Make extensions::DictionaryBuilder and extensions::ListValue unmovable. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 10 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

« chrome/browser/extensions/activity_log/activity_log_policy_unittest.cc ('K') | « extensions/common/extension_builder.h ('k') | extensions/common/features/base_feature_provider_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: extensions/common/extension_builder.cc

diff --git a/extensions/common/extension_builder.cc b/extensions/common/extension_builder.cc

index 9e411668f58c0bf63f007d52e48e49ed744a1987..905ba6b2dfa2edcc27f64bf6d21c822c17f60d42 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;

}