| Index: chrome/browser/ui/android/website_settings_popup_android.h
|
| diff --git a/chrome/browser/ui/android/website_settings_popup_android.h b/chrome/browser/ui/android/website_settings_popup_android.h
|
| index 75c4ea5f85a7ce92f83f00e508ec6e4503188ee4..69a4e36bf9591efb2cfd123d3189aea57878b449 100644
|
| --- a/chrome/browser/ui/android/website_settings_popup_android.h
|
| +++ b/chrome/browser/ui/android/website_settings_popup_android.h
|
| @@ -16,6 +16,17 @@ namespace content {
|
| class WebContents;
|
| }
|
|
|
| +// A Java counterpart will be generated for this enum.
|
| +// GENERATED_JAVA_ENUM_PACKAGE: org.chromium.chrome.browser
|
| +enum PageInfoConnectionType {
|
| + CONNECTION_UNKNOWN,
|
| + CONNECTION_ENCRYPTED,
|
| + CONNECTION_MIXED_CONTENT,
|
| + CONNECTION_UNENCRYPTED,
|
| + CONNECTION_ENCRYPTED_ERROR,
|
| + CONNECTION_INTERNAL_PAGE,
|
| +};
|
| +
|
| // Android implementation of the website settings UI.
|
| class WebsiteSettingsPopupAndroid : public WebsiteSettingsUI {
|
| public:
|
| @@ -25,10 +36,6 @@ class WebsiteSettingsPopupAndroid : public WebsiteSettingsUI {
|
| virtual ~WebsiteSettingsPopupAndroid();
|
| void Destroy(JNIEnv* env, jobject obj);
|
|
|
| - // Revokes any current user exceptions for bypassing SSL error interstitials
|
| - // on this page.
|
| - void ResetCertDecisions(JNIEnv* env, jobject obj, jobject java_web_contents);
|
| -
|
| // WebsiteSettingsUI implementations.
|
| virtual void SetCookieInfo(const CookieInfoList& cookie_info_list) OVERRIDE;
|
| virtual void SetPermissionInfo(
|
| @@ -46,6 +53,8 @@ class WebsiteSettingsPopupAndroid : public WebsiteSettingsUI {
|
| // The java prompt implementation.
|
| base::android::ScopedJavaGlobalRef<jobject> popup_jobject_;
|
|
|
| + GURL url_;
|
| +
|
| DISALLOW_COPY_AND_ASSIGN(WebsiteSettingsPopupAndroid);
|
| };
|
|
|
|
|