Implement Site Settings \ Images category.

chrome/browser/android/preferences/pref_service_bridge.cc

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 78484c75a205d4e38066f21e19e33d669f4be101..7875e47a96bdac0c7436f808bdde90624f2feefb 100644
--- a/chrome/browser/android/preferences/pref_service_bridge.cc
+++ b/chrome/browser/android/preferences/pref_service_bridge.cc
@@ -466,6 +466,25 @@ static void ResetTranslateDefaults(JNIEnv* env, jobject obj) {
   translate_prefs->ResetToDefaults();
 }
 
+static jboolean GetImagesManaged(JNIEnv* env, jobject obj) {
+  return IsContentSettingManaged(CONTENT_SETTINGS_TYPE_IMAGES);
+}
+
+static jboolean GetImagesEnabled(JNIEnv* env, jobject obj) {
+  HostContentSettingsMap* content_settings =
+      GetOriginalProfile()->GetHostContentSettingsMap();
+  return content_settings->GetDefaultContentSetting(
+      CONTENT_SETTINGS_TYPE_IMAGES, NULL) == CONTENT_SETTING_ALLOW;

[newt (away), 2015/04/09 23:43:20]

use nullptr

[Finnur, 2015/04/10 17:03:26]

Done.

+}
+
+static void SetImagesEnabled(JNIEnv* env, jobject obj, jboolean allow) {
+  HostContentSettingsMap* host_content_settings_map =
+      GetOriginalProfile()->GetHostContentSettingsMap();
+  host_content_settings_map->SetDefaultContentSetting(
+      CONTENT_SETTINGS_TYPE_IMAGES,
+      allow ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
+}
+
 static jboolean GetJavaScriptManaged(JNIEnv* env, jobject obj) {
   return IsContentSettingManaged(CONTENT_SETTINGS_TYPE_JAVASCRIPT);
 }
@@ -577,6 +596,35 @@ static void SetAutologinEnabled(JNIEnv* env, jobject obj,
   GetPrefService()->SetBoolean(prefs::kAutologinEnabled, autologinEnabled);
 }
 
+static void SetImagesAllowed(JNIEnv* env, jobject obj, jstring pattern,

[newt (away), 2015/04/09 23:43:20]

The proliferation of these almost-identical methods is... smelly.

ImagesExceptionInfo, JavaScriptExceptionInfo, and PopupExceptionInfo are almost
identical. SetImagesAllowed(), SetJavaScriptAllowed() and SetPopupException()
are almost identical. Same for GetImagesException(), GetJavaScriptException(),
and GetPopupExceptions().

These should all be merged. For the *ExceptionInfo classes, there should be an
extra member variable specifying the content setting type that the exception
applies to (if that's even needed; maybe it's not). For the methods in this
file, they could take an extra parameter that specifies the content setting type
to act on.

I'd like to see similar changes for all the identical Get*Enabled(),
Get*Managed(), and Set*Enabled() methods, but that's a larger change that should
be in a separate CL.

[Finnur, 2015/04/10 17:03:26]

Yeah, I agree. This is ripe for a cleanup and I tackled it in this CL.

+                             int setting) {
+  HostContentSettingsMap* host_content_settings_map =
+      GetOriginalProfile()->GetHostContentSettingsMap();
+  host_content_settings_map->SetContentSetting(
+      ContentSettingsPattern::FromString(ConvertJavaStringToUTF8(env, pattern)),
+      ContentSettingsPattern::Wildcard(),
+      CONTENT_SETTINGS_TYPE_IMAGES,
+      "",
+      static_cast<ContentSetting>(setting));
+}
+
+static void GetImagesExceptions(JNIEnv* env, jobject obj, jobject list) {
+  HostContentSettingsMap* host_content_settings_map =
+      GetOriginalProfile()->GetHostContentSettingsMap();
+  ContentSettingsForOneType entries;
+  host_content_settings_map->GetSettingsForOneType(
+      CONTENT_SETTINGS_TYPE_IMAGES, "", &entries);
+  for (size_t i = 0; i < entries.size(); ++i) {
+    Java_PrefServiceBridge_addImagesExceptionToList(
+        env, list,
+        ConvertUTF8ToJavaString(
+            env, entries[i].primary_pattern.ToString()).obj(),
+        ConvertUTF8ToJavaString(
+            env, GetStringForContentSettingsType(entries[i].setting)).obj(),
+        ConvertUTF8ToJavaString(env, entries[i].source).obj());
+  }
+}
+
 static void SetJavaScriptAllowed(JNIEnv* env, jobject obj, jstring pattern,
                                  int setting) {
   HostContentSettingsMap* host_content_settings_map =