Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / android / website_settings_popup_android.h

diff --git a/src/chrome/browser/ui/android/website_settings_popup_android.h b/src/chrome/browser/ui/android/website_settings_popup_android.h
index 2edbe62..75c4ea5 100644 (file)
--- a/src/chrome/browser/ui/android/website_settings_popup_android.h
+++ b/src/chrome/browser/ui/android/website_settings_popup_android.h
@@ -16,33 +16,30 @@ namespace content {
 class WebContents;
 }
 
-// Androidimplementation of the website settings UI.
+// Android implementation of the website settings UI.
 class WebsiteSettingsPopupAndroid : public WebsiteSettingsUI {
  public:
-  static void Show(JNIEnv* env,
-                   jobject context,
-                   jobject java_content_view,
-                   content::WebContents* web_contents);
-
+  WebsiteSettingsPopupAndroid(JNIEnv* env,
+                              jobject java_website_settings,
+                              content::WebContents* web_contents);
   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(
       const PermissionInfoList& permission_info_list) OVERRIDE;
   virtual void SetIdentityInfo(const IdentityInfo& identity_info) OVERRIDE;
-  virtual void SetFirstVisit(const string16& first_visit) OVERRIDE;
+  virtual void SetFirstVisit(const base::string16& first_visit) OVERRIDE;
   virtual void SetSelectedTab(WebsiteSettingsUI::TabId tab_id) OVERRIDE;
 
   static bool RegisterWebsiteSettingsPopupAndroid(JNIEnv* env);
 
  private:
-  WebsiteSettingsPopupAndroid(JNIEnv* env,
-                              jobject context,
-                              jobject java_content_view,
-                              content::WebContents* web_contents);
-
   // The presenter that controlls the Website Settings UI.
   scoped_ptr<WebsiteSettings> presenter_;