chrome/browser/host_content_settings_map.cc - Issue 2963006: Remove the cookie prompt from the settings UI and migrate prefs from ask to block.

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/host_content_settings_map.cc

Issue 2963006: Remove the cookie prompt from the settings UI and migrate prefs from ask to block. (Closed)

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

Index: chrome/browser/host_content_settings_map.cc

diff --git a/chrome/browser/host_content_settings_map.cc b/chrome/browser/host_content_settings_map.cc

index 590d5f0f0e2cbf6d5bf3bf1a42b2bc2bc0e094ae..611b645acb36efe96cf810dc86437357a37d676b 100644

--- a/chrome/browser/host_content_settings_map.cc

+++ b/chrome/browser/host_content_settings_map.cc

@@ -569,6 +569,9 @@ void HostContentSettingsMap::GetSettingsFromDictionary(

}

+ // Migrate obsolete cookie prompt mode.

+ if (settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] == CONTENT_SETTING_ASK)

+ settings->settings[CONTENT_SETTINGS_TYPE_COOKIES] = CONTENT_SETTING_BLOCK;

}

void HostContentSettingsMap::ForceDefaultsToBeExplicit() {