chrome/browser/content_settings/content_settings_pref_provider.cc - Issue 21030009: Make element removal methods in DictionaryValue and ListValue take scoped_ptr's as outparams.

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: chrome/browser/content_settings/content_settings_pref_provider.cc

Issue 21030009: Make element removal methods in DictionaryValue and ListValue take scoped_ptr's as outparams. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: sync Created 7 years, 4 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 | « chrome/browser/content_settings/content_settings_policy_provider.cc ('k') | chrome/browser/drive/fake_drive_service.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_pref_provider.cc

diff --git a/chrome/browser/content_settings/content_settings_pref_provider.cc b/chrome/browser/content_settings/content_settings_pref_provider.cc

index 569c06c0c5af45d926da048edceeea67ac5cc2a3..482c3a57a36f5451e678e231153f94625a0c3285 100644

--- a/chrome/browser/content_settings/content_settings_pref_provider.cc

+++ b/chrome/browser/content_settings/content_settings_pref_provider.cc

@@ -548,11 +548,11 @@ void PrefProvider::CanonicalizeContentSettingsExceptions(

}

for (size_t i = 0; i < move_items.size(); ++i) {

- Value* pattern_settings_dictionary = NULL;

+ scoped_ptr<Value> pattern_settings_dictionary;

all_settings_dictionary->RemoveWithoutPathExpansion(

move_items[i].first, &pattern_settings_dictionary);

all_settings_dictionary->SetWithoutPathExpansion(

- move_items[i].second, pattern_settings_dictionary);

+ move_items[i].second, pattern_settings_dictionary.release());

}

« no previous file with comments | « chrome/browser/content_settings/content_settings_policy_provider.cc ('k') | chrome/browser/drive/fake_drive_service.cc » ('j') | no next file with comments »