Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/AddExceptionPreference.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/AddExceptionPreference.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/AddExceptionPreference.java |
index ea04cddaeacd0e9c56e0351ff88cd905419a9caa..fb382a510685dfb16a48c76c53268b06b92af12b 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/AddExceptionPreference.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/AddExceptionPreference.java |
@@ -22,11 +22,10 @@ import android.view.View; |
import android.widget.Button; |
import android.widget.EditText; |
import android.widget.TextView; |
-import android.widget.Toast; |
import org.chromium.base.ApiCompatibilityUtils; |
import org.chromium.chrome.R; |
-import org.chromium.chrome.browser.preferences.PrefServiceBridge; |
+import org.chromium.chrome.browser.ContentSettingsType; |
/** |
* A utility class for the UI recording exceptions to the blocked list for site |
@@ -35,13 +34,19 @@ import org.chromium.chrome.browser.preferences.PrefServiceBridge; |
public class AddExceptionPreference extends Preference implements OnPreferenceClickListener { |
// The callback to notify when the user adds a site. |
private SiteAddedCallback mSiteAddedCallback; |
+ |
+ // The accent color to use for the icon and title view. |
private int mPrefAccentColor; |
+ // The Content Setting Type this class is working with. |
+ private int mContentSettingsType; |
+ |
/** |
- * An interface to implement to get a callback when a site has been added. |
+ * An interface to implement to get a callback when a site needs to be added. |
+ * @param hostname The hostname to add. |
*/ |
public interface SiteAddedCallback { |
- public void onSiteAdded(); |
+ public void onAddSite(String hostname); |
} |
/** |
@@ -50,8 +55,10 @@ public class AddExceptionPreference extends Preference implements OnPreferenceCl |
* @param key The key to use for the preference. |
* @param callback A callback to receive notifications that an exception has been added. |
*/ |
- public AddExceptionPreference(Context context, String key, SiteAddedCallback callback) { |
+ public AddExceptionPreference( |
+ Context context, String key, int contentSettingsType, SiteAddedCallback callback) { |
newt (away)
2015/04/09 23:43:20
Instead of passing in the contentSettingsType, how
Finnur
2015/04/10 17:03:25
That's a good idea.
|
super(context); |
+ mContentSettingsType = contentSettingsType; |
mSiteAddedCallback = callback; |
setOnPreferenceClickListener(this); |
@@ -94,16 +101,7 @@ public class AddExceptionPreference extends Preference implements OnPreferenceCl |
@Override |
public void onClick(DialogInterface dialog, int button) { |
if (button == AlertDialog.BUTTON_POSITIVE) { |
- String hostname = input.getText().toString().trim(); |
- PrefServiceBridge.getInstance().setJavaScriptAllowed( |
- hostname, true); |
- |
- Toast.makeText(getContext(), |
- String.format(getContext().getString( |
- R.string.website_settings_add_site_toast), |
- hostname), |
- Toast.LENGTH_SHORT).show(); |
- mSiteAddedCallback.onSiteAdded(); |
+ mSiteAddedCallback.onAddSite(input.getText().toString().trim()); |
} else { |
dialog.dismiss(); |
} |
@@ -111,9 +109,17 @@ public class AddExceptionPreference extends Preference implements OnPreferenceCl |
}; |
AlertDialog.Builder alert = new AlertDialog.Builder(getContext()); |
+ int resource = 0; |
+ if (mContentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_JAVASCRIPT) { |
+ resource = R.string.website_settings_add_site_description_javascript; |
+ } else if (mContentSettingsType == ContentSettingsType.CONTENT_SETTINGS_TYPE_IMAGES) { |
+ resource = R.string.website_settings_add_site_description_images; |
+ } |
+ assert resource > 0; |
+ |
AlertDialog alertDialog = alert |
.setTitle(R.string.website_settings_add_site_dialog_title) |
- .setMessage(R.string.website_settings_add_site_description) |
+ .setMessage(resource) |
.setView(view) |
.setPositiveButton(R.string.website_settings_add_site_add_button, |
onClickListener) |