Implement Site Settings \ Images category.

chrome/browser/android/preferences/pref_service_bridge.cc

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/android/preferences/pref_service_bridge.h"
 
 #include <jni.h>
 
 #include "base/android/build_info.h"
 #include "base/android/jni_android.h"
@@ skipping 448 matching lines @@
 static void SetTranslateEnabled(JNIEnv* env, jobject obj, jboolean enabled) {
   GetPrefService()->SetBoolean(prefs::kEnableTranslate, enabled);
 }
 
 static void ResetTranslateDefaults(JNIEnv* env, jobject obj) {
   scoped_ptr<translate::TranslatePrefs> translate_prefs =
       ChromeTranslateClient::CreateTranslatePrefs(GetPrefService());
   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);
 }
 
 static void SetJavaScriptEnabled(JNIEnv* env, jobject obj, jboolean enabled) {
   HostContentSettingsMap* host_content_settings_map =
       GetOriginalProfile()->GetHostContentSettingsMap();
   host_content_settings_map->SetDefaultContentSetting(
       CONTENT_SETTINGS_TYPE_JAVASCRIPT,
       enabled ? CONTENT_SETTING_ALLOW : CONTENT_SETTING_BLOCK);
@@ skipping 91 matching lines @@
 
 static jboolean GetAutologinEnabled(JNIEnv* env, jobject obj) {
   return GetPrefService()->GetBoolean(prefs::kAutologinEnabled);
 }
 
 static void SetAutologinEnabled(JNIEnv* env, jobject obj,
                                 jboolean autologinEnabled) {
   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 =
       GetOriginalProfile()->GetHostContentSettingsMap();
   host_content_settings_map->SetContentSetting(
       ContentSettingsPattern::FromString(ConvertJavaStringToUTF8(env, pattern)),
       ContentSettingsPattern::Wildcard(),
       CONTENT_SETTINGS_TYPE_JAVASCRIPT,
       "",
       static_cast<ContentSetting>(setting));
@@ skipping 219 matching lines @@
                                                                jobject obj) {
   return ConvertUTF8ToJavaString(
       env,
       GetPrefService()->GetString(
           prefs::kSupervisedUserSecondCustodianProfileImageURL)).Release();
 }
 
 bool RegisterPrefServiceBridge(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }