| Index: chrome/android/java/src/org/chromium/chrome/browser/preferences/website/JavaScriptExceptionInfo.java
|
| diff --git a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/JavaScriptExceptionInfo.java b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/JavaScriptExceptionInfo.java
|
| index dfc7697ae7955c539b4b592cdba90e7ff8b68ca7..8d18a02265742136df0cb3a2941b98d445bb28f5 100644
|
| --- a/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/JavaScriptExceptionInfo.java
|
| +++ b/chrome/android/java/src/org/chromium/chrome/browser/preferences/website/JavaScriptExceptionInfo.java
|
| @@ -27,7 +27,7 @@ public class JavaScriptExceptionInfo implements Serializable {
|
| }
|
|
|
| public String getSetting() {
|
| - return mPattern;
|
| + return mSetting;
|
| }
|
|
|
| public String getSource() {
|
| @@ -35,7 +35,7 @@ public class JavaScriptExceptionInfo implements Serializable {
|
| }
|
|
|
| /**
|
| - * @return The ContentSetting specifying whether popups are allowed for this pattern.
|
| + * @return The ContentSetting specifying whether Javascript is allowed for this pattern.
|
| */
|
| public ContentSetting getContentSetting() {
|
| if (mSetting.equals(PrefServiceBridge.EXCEPTION_SETTING_ALLOW)) {
|
| @@ -48,7 +48,7 @@ public class JavaScriptExceptionInfo implements Serializable {
|
| }
|
|
|
| /**
|
| - * Sets whether popups are allowed for this pattern.
|
| + * Sets whether Javascript is allowed for this pattern.
|
| */
|
| public void setContentSetting(ContentSetting value) {
|
| if (value != null) {
|
|
|