Implement Site Settings \ Images category.

chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ImagesExceptionInfo.java

Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ImagesExceptionInfo.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/PopupExceptionInfo.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ImagesExceptionInfo.java
similarity index 72%
copy from chrome/android/java/src/org/chromium/chrome/browser/preferences/website/PopupExceptionInfo.java
copy to chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ImagesExceptionInfo.java
index a6ff7fbd07b5efd1c894678275d89f8c272c01cd..20eb287c487e24f3bbe45e9881abf6743fb2f328 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/PopupExceptionInfo.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/ImagesExceptionInfo.java
@@ -9,14 +9,14 @@ import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import java.io.Serializable;
 
 /**
- * Popup exception information for a given URL pattern.
+ * Images exception information for a given origin.
  */
-public class PopupExceptionInfo implements Serializable {
+public class ImagesExceptionInfo implements Serializable {
     private final String mPattern;
     private final String mSetting;
     private final String mSource;
 
-    public PopupExceptionInfo(String pattern, String setting, String source) {
+    public ImagesExceptionInfo(String pattern, String setting, String source) {
         mPattern = pattern;
         mSetting = setting;
         mSource = source;
@@ -27,7 +27,7 @@ public class PopupExceptionInfo implements Serializable {
     }
 
     public String getSetting() {
-        return mPattern;
+        return mSetting;
     }
 
     public String getSource() {
@@ -35,7 +35,7 @@ public class PopupExceptionInfo implements Serializable {
     }
 
     /**
-     * @return The ContentSetting specifying whether popups are allowed for this pattern.
+     * @return The ContentSetting specifying whether images are allowed for this pattern.
      */
     public ContentSetting getContentSetting() {
         if (mSetting.equals(PrefServiceBridge.EXCEPTION_SETTING_ALLOW)) {
@@ -48,14 +48,14 @@ public class PopupExceptionInfo implements Serializable {
     }
 
     /**
-     * Sets whether popups are allowed for this pattern.
+     * Sets whether images are allowed for this pattern.
      */
     public void setContentSetting(ContentSetting value) {
         if (value != null) {
-            PrefServiceBridge.getInstance().setPopupException(
+            PrefServiceBridge.getInstance().setImagesAllowed(
                     mPattern, value == ContentSetting.ALLOW ? true : false);
         } else {
-            PrefServiceBridge.getInstance().removePopupException(mPattern);
+            PrefServiceBridge.getInstance().removeImagesException(mPattern);
         }
     }
-}
+}