chrome/browser/content_settings/host_content_settings_map.cc - Issue 9293010: Merge 119773 - Move click-to-play out of chrome://flags.

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

Issue 9293010: Merge 119773 - Move click-to-play out of chrome://flags. (Closed) Base URL: svn://svn.chromium.org/chrome/branches/963/src

Patch Set: '' Created 8 years, 11 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/content_settings/host_content_settings_map.cc

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

index 82815fc5d988b35d64c32229b33d5e704a9fdafe..b681b1cc4896b68f3d7832009a41607f1eab72e2 100644

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

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

@@ -326,9 +326,6 @@ bool HostContentSettingsMap::IsSettingAllowedForType(

case CONTENT_SETTINGS_TYPE_COOKIES:

return setting == CONTENT_SETTING_SESSION_ONLY;

case CONTENT_SETTINGS_TYPE_PLUGINS:

- return setting == CONTENT_SETTING_ASK &&

- CommandLine::ForCurrentProcess()->HasSwitch(

- switches::kEnableClickToPlay);

case CONTENT_SETTINGS_TYPE_GEOLOCATION:

case CONTENT_SETTINGS_TYPE_NOTIFICATIONS:

case CONTENT_SETTINGS_TYPE_INTENTS: