chrome/browser/content_settings/content_settings_default_provider.cc - Issue 9293008: 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/content_settings_default_provider.cc

Issue 9293008: Move click-to-play out of chrome://flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: review 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:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/chrome_content_browser_client.cc ('k') | chrome/browser/content_settings/content_settings_pref_provider.cc » ('j') | chrome/browser/resources/options/content_settings_exceptions_area.js » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/content_settings_default_provider.cc

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

index bcc3db710e29afe3732836a98ae893364f48b484..ce4a7841e33c0eadde9f434fb27cc2bd65a6a1c6 100644

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

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

@@ -350,15 +350,6 @@ void DefaultProvider::GetSettingsFromDictionary(

default_settings_[CONTENT_SETTINGS_TYPE_COOKIES].reset(

Value::CreateIntegerValue(CONTENT_SETTING_BLOCK));

}

- if (default_settings_[CONTENT_SETTINGS_TYPE_PLUGINS].get()) {

- ContentSetting plugin_setting = ValueToContentSetting(

- default_settings_[CONTENT_SETTINGS_TYPE_PLUGINS].get());

- plugin_setting =

- ClickToPlayFixup(CONTENT_SETTINGS_TYPE_PLUGINS, plugin_setting);

- default_settings_[CONTENT_SETTINGS_TYPE_PLUGINS].reset(

- Value::CreateIntegerValue(plugin_setting));

- }

}

void DefaultProvider::MigrateObsoleteNotificationPref() {