Index: chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopupLegacy.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopupLegacy.java |
similarity index 94% |
copy from chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java |
copy to chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopupLegacy.java |
index d4d0cf541b3bbf78b4503825166831c1f2ba2a18..eaba3cf5b8e57bf6bcb5e3b26b9cd083eae91df6 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopup.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/WebsiteSettingsPopupLegacy.java |
@@ -33,7 +33,7 @@ import java.net.URISyntaxException; |
/** |
* Java side of Android implementation of the website settings UI. |
*/ |
-public class WebsiteSettingsPopup implements OnClickListener { |
+public class WebsiteSettingsPopupLegacy implements OnClickListener { |
private static final String HELP_URL = |
"http://www.google.com/support/chrome/bin/answer.py?answer=95617"; |
private static final int DESCRIPTION_TEXT_SIZE_SP = 12; |
@@ -48,7 +48,7 @@ public class WebsiteSettingsPopup implements OnClickListener { |
private Button mResetCertDecisionsButton; |
private String mLinkUrl; |
- private WebsiteSettingsPopup(Context context, WebContents webContents) { |
+ private WebsiteSettingsPopupLegacy(Context context, WebContents webContents) { |
mContext = context; |
mWebContents = webContents; |
@@ -184,7 +184,7 @@ public class WebsiteSettingsPopup implements OnClickListener { |
mDescriptionLayout.addView(mMoreInfoLink); |
} |
- /** Displays the WebsiteSettingsPopup. */ |
+ /** Displays the WebsiteSettingsPopupLegacy. */ |
@CalledByNative |
private void showDialog() { |
ScrollView scrollView = new ScrollView(mContext); |
@@ -214,7 +214,9 @@ public class WebsiteSettingsPopup implements OnClickListener { |
i.putExtra(Browser.EXTRA_CREATE_NEW_TAB, true); |
i.putExtra(Browser.EXTRA_APPLICATION_ID, mContext.getPackageName()); |
mContext.startActivity(i); |
- } catch (URISyntaxException ex) {} |
+ } catch (URISyntaxException ex) { |
+ // Do nothing. |
+ } |
} |
} |
@@ -230,12 +232,13 @@ public class WebsiteSettingsPopup implements OnClickListener { |
*/ |
@SuppressWarnings("unused") |
public static void show(Context context, WebContents webContents) { |
- new WebsiteSettingsPopup(context, webContents); |
+ new WebsiteSettingsPopupLegacy(context, webContents); |
} |
- private static native long nativeInit(WebsiteSettingsPopup popup, WebContents webContents); |
- private native void nativeDestroy(long nativeWebsiteSettingsPopupAndroid); |
+ private static native long nativeInit(WebsiteSettingsPopupLegacy popup, |
+ WebContents webContents); |
+ private native void nativeDestroy(long nativeWebsiteSettingsPopupLegacyAndroid); |
private native void nativeResetCertDecisions( |
- long nativeWebsiteSettingsPopupAndroid, WebContents webContents); |
+ long nativeWebsiteSettingsPopupLegacyAndroid, WebContents webContents); |
private native byte[][] nativeGetCertificateChain(WebContents webContents); |
} |