Replaced the current WebsiteSettings dialog with a new PageInfo dialog

chrome/browser/ui/android/website_settings_popup_legacy_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 "chrome/browser/ui/android/website_settings_popup_legacy_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/ui/website_settings/website_settings.h"
 #include "chrome/grit/generated_resources.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 "jni/WebsiteSettingsPopup_jni.h"
+#include "jni/WebsiteSettingsPopupLegacy_jni.h"
 #include "net/cert/x509_certificate.h"
 #include "ui/base/l10n/l10n_util.h"
 
 using base::android::CheckException;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::GetClass;
 using base::android::ScopedJavaLocalRef;
 using content::CertStore;
 using content::WebContents;
@@ skipping 36 matching lines @@
 
 // static
 static jlong Init(JNIEnv* env,
                   jclass clazz,
                   jobject obj,
                   jobject java_web_contents) {
   content::WebContents* web_contents =
       content::WebContents::FromJavaWebContents(java_web_contents);
 
   return reinterpret_cast<intptr_t>(
-      new WebsiteSettingsPopupAndroid(env, obj, web_contents));
+      new WebsiteSettingsPopupLegacyAndroid(env, obj, web_contents));
 }
 
-WebsiteSettingsPopupAndroid::WebsiteSettingsPopupAndroid(
+WebsiteSettingsPopupLegacyAndroid::WebsiteSettingsPopupLegacyAndroid(
     JNIEnv* env,
     jobject java_website_settings_pop,
     WebContents* web_contents) {
   // Important to use GetVisibleEntry to match what's showing in the omnibox.
   content::NavigationEntry* nav_entry =
       web_contents->GetController().GetVisibleEntry();
   if (nav_entry == NULL)
     return;
 
   popup_jobject_.Reset(env, java_website_settings_pop);
 
   presenter_.reset(new WebsiteSettings(
       this,
       Profile::FromBrowserContext(web_contents->GetBrowserContext()),
       TabSpecificContentSettings::FromWebContents(web_contents),
       InfoBarService::FromWebContents(web_contents),
       nav_entry->GetURL(),
       nav_entry->GetSSL(),
       content::CertStore::GetInstance()));
 }
 
-WebsiteSettingsPopupAndroid::~WebsiteSettingsPopupAndroid() {}
+WebsiteSettingsPopupLegacyAndroid::~WebsiteSettingsPopupLegacyAndroid() {
+}
 
-void WebsiteSettingsPopupAndroid::Destroy(JNIEnv* env, jobject obj) {
+void WebsiteSettingsPopupLegacyAndroid::Destroy(JNIEnv* env, jobject obj) {
   delete this;
 }
 
-void WebsiteSettingsPopupAndroid::ResetCertDecisions(
+void WebsiteSettingsPopupLegacyAndroid::ResetCertDecisions(
     JNIEnv* env,
     jobject obj,
     jobject java_web_contents) {
   presenter_->OnRevokeSSLErrorBypassButtonPressed();
 }
 
-void WebsiteSettingsPopupAndroid::SetIdentityInfo(
+void WebsiteSettingsPopupLegacyAndroid::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);
+    ScopedJavaLocalRef<jstring> description =
+        ConvertUTF8ToJavaString(env, identity_info.identity_status_description);
     base::string16 certificate_label =
         l10n_util::GetStringUTF16(IDS_PAGEINFO_CERT_INFO_BUTTON);
-    Java_WebsiteSettingsPopup_addCertificateSection(
+    Java_WebsiteSettingsPopupLegacy_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(
+      Java_WebsiteSettingsPopupLegacy_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(
+    Java_WebsiteSettingsPopupLegacy_addDescriptionSection(
         env, popup_jobject_.obj(), icon_id, NULL, description.obj());
   }
 
-  Java_WebsiteSettingsPopup_addMoreInfoLink(env, popup_jobject_.obj(),
+  Java_WebsiteSettingsPopupLegacy_addMoreInfoLink(
+      env,
+      popup_jobject_.obj(),
       ConvertUTF8ToJavaString(
           env, l10n_util::GetStringUTF8(IDS_PAGE_INFO_HELP_CENTER_LINK)).obj());
-  Java_WebsiteSettingsPopup_showDialog(env, popup_jobject_.obj());
+  Java_WebsiteSettingsPopupLegacy_showDialog(env, popup_jobject_.obj());
 }
 
-void WebsiteSettingsPopupAndroid::SetCookieInfo(
+void WebsiteSettingsPopupLegacyAndroid::SetCookieInfo(
     const CookieInfoList& cookie_info_list) {
   NOTIMPLEMENTED();
 }
 
-void WebsiteSettingsPopupAndroid::SetPermissionInfo(
+void WebsiteSettingsPopupLegacyAndroid::SetPermissionInfo(
     const PermissionInfoList& permission_info_list) {
   NOTIMPLEMENTED();
 }
 
-void WebsiteSettingsPopupAndroid::SetSelectedTab(
+void WebsiteSettingsPopupLegacyAndroid::SetSelectedTab(
     WebsiteSettingsUI::TabId tab_id) {
   // There's no tab UI on Android - only connection info is shown.
   NOTIMPLEMENTED();
 }
 
-void WebsiteSettingsPopupAndroid::SetFirstVisit(
+void WebsiteSettingsPopupLegacyAndroid::SetFirstVisit(
     const base::string16& first_visit) {
   NOTIMPLEMENTED();
 }
 
 // static
-bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid(
+bool
+WebsiteSettingsPopupLegacyAndroid::RegisterWebsiteSettingsPopupLegacyAndroid(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }