Redesign GUI of Website Setting Popup Dialog

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"
@@ skipping 107 matching lines @@
     // 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_addSection(env, popup_jobject_.obj(), icon_id,
-        ConvertUTF8ToJavaString(env, headline).obj(), description.obj());
+    Java_WebsiteSettingsPopup_addCertificateSection(
+        env,
+        popup_jobject_.obj(),
+        icon_id,
+        ConvertUTF8ToJavaString(env, headline).obj(),
+        description.obj());
 
     base::string16 certificate_label =
         l10n_util::GetStringUTF16(IDS_PAGEINFO_CERT_INFO_BUTTON);
     if (!certificate_label.empty()) {
-      Java_WebsiteSettingsPopup_setCertificateViewer(env, popup_jobject_.obj(),
+      Java_WebsiteSettingsPopup_setCertificateViewer(

[David Trainor- moved to gerrit, 2014/07/23 17:23:54]

Can we just pass the cert label to the function above?  And treat an empty/null
string as if it isn't there?  They you wouldn't have to save the section
anymore.

[Ian Wen, 2014/07/23 18:28:26]

Done.

+          env,
+          popup_jobject_.obj(),
           ConvertUTF16ToJavaString(env, certificate_label).obj());
     }
-
-    Java_WebsiteSettingsPopup_addDivider(env, popup_jobject_.obj());
   }
 
   {
     int icon_id = ResourceMapper::MapFromChromiumId(
         WebsiteSettingsUI::GetConnectionIconID(
             identity_info.connection_status));
 
     ScopedJavaLocalRef<jstring> description = ConvertUTF8ToJavaString(
         env, identity_info.connection_status_description);
-    Java_WebsiteSettingsPopup_addSection(env, popup_jobject_.obj(), icon_id,
-        NULL, description.obj());
-
-    Java_WebsiteSettingsPopup_addDivider(env, popup_jobject_.obj());
+    Java_WebsiteSettingsPopup_addDescriptionSection(
+        env, popup_jobject_.obj(), icon_id, NULL, description.obj());
   }
 
   Java_WebsiteSettingsPopup_addMoreInfoLink(env, popup_jobject_.obj(),
       ConvertUTF8ToJavaString(
           env, l10n_util::GetStringUTF8(IDS_PAGE_INFO_HELP_CENTER_LINK)).obj());
   Java_WebsiteSettingsPopup_showDialog(env, popup_jobject_.obj());
 }
 
 void WebsiteSettingsPopupAndroid::SetCookieInfo(
     const CookieInfoList& cookie_info_list) {
@@ skipping 14 matching lines @@
 void WebsiteSettingsPopupAndroid::SetFirstVisit(
     const base::string16& first_visit) {
   NOTIMPLEMENTED();
 }
 
 // static
 bool WebsiteSettingsPopupAndroid::RegisterWebsiteSettingsPopupAndroid(
     JNIEnv* env) {
   return RegisterNativesImpl(env);
 }