Add button to page info to revoke user certificate decisions.

chrome/browser/ui/android/website_settings_popup_android.cc

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/android/website_settings_popup_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "chrome/browser/android/resource_mapper.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/ssl/chrome_ssl_host_state_delegate.h"
+#include "chrome/browser/ssl/chrome_ssl_host_state_delegate_factory.h"
 #include "chrome/browser/ui/website_settings/website_settings.h"
+#include "content/public/browser/browser_context.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/ssl_status.h"
 #include "grit/generated_resources.h"
 #include "jni/WebsiteSettingsPopup_jni.h"
 #include "net/cert/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 74 matching lines @@
       nav_entry->GetSSL(),
       content::CertStore::GetInstance()));
 }
 
 WebsiteSettingsPopupAndroid::~WebsiteSettingsPopupAndroid() {}
 
 void WebsiteSettingsPopupAndroid::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
+void WebsiteSettingsPopupAndroid::ResetCertDecisions(
+    JNIEnv* env,
+    jobject obj,
+    jobject java_web_contents) {
+  content::WebContents* web_contents =
+      content::WebContents::FromJavaWebContents(java_web_contents);
+  if (!web_contents)
+    return;
+  ChromeSSLHostStateDelegate* delegate =
+      presenter_->chrome_ssl_host_state_delegate();
+  DCHECK(delegate);
+  delegate->RevokeUserDecisionsHard(presenter_->site_url().host());
+}
+
 void WebsiteSettingsPopupAndroid::SetIdentityInfo(
     const IdentityInfo& identity_info) {
   JNIEnv* env = base::android::AttachCurrentThread();
 
   {
     int icon_id = ResourceMapper::MapFromChromiumId(
         WebsiteSettingsUI::GetIdentityIconID(identity_info.identity_status));
 
     // The headline and the certificate dialog link of the site's identity
     // section is only displayed if the site's identity was verified. If the
     // site's identity was verified, then the headline contains the organization
     // name from the provided certificate. If the organization name is not
     // available than the hostname of the site is used instead.
     std::string headline;
     if (identity_info.cert_id) {
       headline = identity_info.site_identity;
     }
 
     ScopedJavaLocalRef<jstring> description = ConvertUTF8ToJavaString(
         env, identity_info.identity_status_description);
+    Java_WebsiteSettingsPopup_addDescriptionSection(
+        env,
+        popup_jobject_.obj(),
+        icon_id,
+        ConvertUTF8ToJavaString(env, headline).obj(),
+        description.obj());
+
     base::string16 certificate_label =
-            l10n_util::GetStringUTF16(IDS_PAGEINFO_CERT_INFO_BUTTON);
+        l10n_util::GetStringUTF16(IDS_PAGEINFO_CERT_INFO_BUTTON);
     Java_WebsiteSettingsPopup_addCertificateSection(
         env,
         popup_jobject_.obj(),
         icon_id,
         ConvertUTF8ToJavaString(env, headline).obj(),
         description.obj(),
         ConvertUTF16ToJavaString(env, certificate_label).obj());
+
+    if (identity_info.show_ssl_decision_revoke_button) {
+      base::string16 reset_button_label = l10n_util::GetStringUTF16(
+          IDS_PAGEINFO_RESET_INVALID_CERTIFICATE_DECISIONS_BUTTON);
+      Java_WebsiteSettingsPopup_addResetCertDecisionsButton(
+          env,
+          popup_jobject_.obj(),
+          ConvertUTF16ToJavaString(env, reset_button_label).obj());
+    }
   }
 
   {
     int icon_id = ResourceMapper::MapFromChromiumId(
         WebsiteSettingsUI::GetConnectionIconID(
             identity_info.connection_status));
 
     ScopedJavaLocalRef<jstring> description = ConvertUTF8ToJavaString(
         env, identity_info.connection_status_description);
     Java_WebsiteSettingsPopup_addDescriptionSection(
@@ skipping 25 matching lines @@
 void WebsiteSettingsPopupAndroid::SetFirstVisit(
     const base::string16& first_visit) {
   NOTIMPLEMENTED();
 }
 
 // static
 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }