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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/android/preferences/pref_service_bridge.cc

Issue 2039803002: Unregister Images, Plugins and Mouselock content settings on android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@only_register_platform_used_contentsettingtypes
Patch Set: address review comments, minor change Created 4 years, 6 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/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java ('k') | chrome/browser/browsing_data/browsing_data_remover_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/android/preferences/pref_service_bridge.cc
diff --git a/chrome/browser/android/preferences/pref_service_bridge.cc b/chrome/browser/android/preferences/pref_service_bridge.cc
index a024647772fcde2471f9e86ede8e3a31eebb3250..44aaeb0e8dbd33e9d4cc96494c285f489ec4aa7f 100644
--- a/chrome/browser/android/preferences/pref_service_bridge.cc
+++ b/chrome/browser/android/preferences/pref_service_bridge.cc
@@ -156,12 +156,9 @@ static void SetContentSettingEnabled(JNIEnv* env,
jboolean allow) {
// Before we migrate functions over to this central function, we must verify
// that the new category supports ALLOW/BLOCK pairs and, if not, handle them.
- // IMAGES is included to allow migrating the setting back for users who had
- // disabled images in M44 (see https://crbug.com/505844).
- // TODO(bauerb): Remove this when the migration code is removed.
DCHECK(content_settings_type == CONTENT_SETTINGS_TYPE_JAVASCRIPT ||
- content_settings_type == CONTENT_SETTINGS_TYPE_POPUPS ||
- content_settings_type == CONTENT_SETTINGS_TYPE_IMAGES);
+ content_settings_type == CONTENT_SETTINGS_TYPE_POPUPS);
+
HostContentSettingsMap* host_content_settings_map =
HostContentSettingsMapFactory::GetForProfile(GetOriginalProfile());
host_content_settings_map->SetDefaultContentSetting(
« no previous file with comments | « chrome/android/java/src/org/chromium/chrome/browser/preferences/PrefServiceBridge.java ('k') | chrome/browser/browsing_data/browsing_data_remover_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698