Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(110)

Unified Diff: chrome/browser/ui/android/website_settings_popup_android.h

Issue 516703002: Replaced the current WebsiteSettings dialog with a new PageInfo dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed "is_android" guard on permission strings. Could have #defined out the function that uses th… Created 6 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 12cdafa3cab4378d95522835492677f6a32ef6ff..89ef6016fcfbc1cad87202265817fd09a340dc53 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);
};

Powered by Google App Engine
This is Rietveld 408576698