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

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

Issue 409003002: Redesign GUI of Website Setting Popup Dialog (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Change java jni function names Created 6 years, 5 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
« chrome/app/generated_resources.grd ('K') | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/android/website_settings_popup_android.cc
diff --git a/chrome/browser/ui/android/website_settings_popup_android.cc b/chrome/browser/ui/android/website_settings_popup_android.cc
index 1c0aabb861159c1090f0125fae56ff2fd5730b1c..1e31488a5ad6ee909afdaeca6cc7c09621415aba 100644
--- a/chrome/browser/ui/android/website_settings_popup_android.cc
+++ b/chrome/browser/ui/android/website_settings_popup_android.cc
@@ -125,17 +125,21 @@ void WebsiteSettingsPopupAndroid::SetIdentityInfo(
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(
+ env,
+ popup_jobject_.obj(),
ConvertUTF16ToJavaString(env, certificate_label).obj());
}
-
- Java_WebsiteSettingsPopup_addDivider(env, popup_jobject_.obj());
}
{
@@ -145,10 +149,8 @@ void WebsiteSettingsPopupAndroid::SetIdentityInfo(
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(),
« chrome/app/generated_resources.grd ('K') | « chrome/app/generated_resources.grd ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698