Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2939)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/content_settings/content_settings_pref_provider.cc

Issue 9293008: Move click-to-play out of chrome://flags. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/content_settings/content_settings_default_provider.cc ('k') | chrome/browser/content_settings/content_settings_utils.h » ('j') | chrome/browser/content_settings/host_content_settings_map.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments 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 8c7f2e4f5b465dd62765d8e07ceeaaaad4143f2b..8b3362a304340c2fb8ad85313c0ceadd24129a9c 100644
--- a/chrome/browser/content_settings/content_settings_pref_provider.cc
+++ b/chrome/browser/content_settings/content_settings_pref_provider.cc
@@ -418,8 +418,6 @@ void PrefProvider::ReadContentSettingsFromPref(bool overwrite) {
found = resource_dictionary->GetIntegerWithoutPathExpansion(
resource_identifier, &setting);
DCHECK_NE(CONTENT_SETTING_DEFAULT, setting);
- setting = ClickToPlayFixup(content_type,
- ContentSetting(setting));
value_map_.SetValue(pattern_pair.first,
pattern_pair.second,
content_type,
@@ -434,8 +432,6 @@ void PrefProvider::ReadContentSettingsFromPref(bool overwrite) {
DCHECK_NE(CONTENT_SETTING_DEFAULT, setting);
setting = FixObsoleteCookiePromptMode(content_type,
ContentSetting(setting));
- setting = ClickToPlayFixup(content_type,
- ContentSetting(setting));
value_map_.SetValue(pattern_pair.first,
pattern_pair.second,
content_type,
@@ -742,7 +738,6 @@ void PrefProvider::MigrateObsoletePerhostPref() {
ContentSetting setting = IntToContentSetting(setting_int_value);
setting = FixObsoleteCookiePromptMode(content_type, setting);
- setting = ClickToPlayFixup(content_type, setting);
if (setting != CONTENT_SETTING_DEFAULT) {
SetWebsiteSetting(
« no previous file with comments | « chrome/browser/content_settings/content_settings_default_provider.cc ('k') | chrome/browser/content_settings/content_settings_utils.h » ('j') | chrome/browser/content_settings/host_content_settings_map.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698