Commit a9f1360c authored by Friedrich Horschig's avatar Friedrich Horschig Committed by Commit Bot

[Android] Readd cancel button to save password infobar

In https://crrev.com/c/1146759, the newly introduced save password
infobar mistakenly had no button to cancel the saving anymore. Closing
the infobar would cancel it.

This CL adds the button for the (still existing) canceling function.

For screenshots of this regression, see the linked bug.

TBR=tedchoc@chromium.org

Bug: 870867
Change-Id: I3432303ef219b1f8fab3e7a7c1e7cce272533d25
Reviewed-on: https://chromium-review.googlesource.com/1183189Reviewed-by: default avatarTed Choc <tedchoc@chromium.org>
Reviewed-by: default avatarVasilii Sukhanov <vasilii@chromium.org>
Commit-Queue: Friedrich Horschig [CEST] <fhorschig@chromium.org>
Cr-Commit-Position: refs/heads/master@{#584763}
parent 8160d033
......@@ -19,14 +19,17 @@ public class SavePasswordInfoBar extends ConfirmInfoBar {
@CalledByNative
private static InfoBar show(int enumeratedIconId, String message, int titleLinkStart,
int titleLinkEnd, String detailsMessage, String primaryButtonText) {
int titleLinkEnd, String detailsMessage, String primaryButtonText,
String secondaryButtonText) {
return new SavePasswordInfoBar(ResourceId.mapToDrawableId(enumeratedIconId), message,
titleLinkStart, titleLinkEnd, detailsMessage, primaryButtonText);
titleLinkStart, titleLinkEnd, detailsMessage, primaryButtonText,
secondaryButtonText);
}
private SavePasswordInfoBar(int iconDrawbleId, String message, int titleLinkStart,
int titleLinkEnd, String detailsMessage, String primaryButtonText) {
super(iconDrawbleId, null, message, null, primaryButtonText, null);
int titleLinkEnd, String detailsMessage, String primaryButtonText,
String secondaryButtonText) {
super(iconDrawbleId, null, message, null, primaryButtonText, secondaryButtonText);
mTitleLinkRangeStart = titleLinkStart;
mTitleLinkRangeEnd = titleLinkEnd;
mDetailsMessage = detailsMessage;
......
......@@ -29,6 +29,9 @@ SavePasswordInfoBar::CreateRenderInfoBar(JNIEnv* env) {
static_cast<SavePasswordInfoBarDelegate*>(delegate());
ScopedJavaLocalRef<jstring> ok_button_text = ConvertUTF16ToJavaString(
env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_OK));
ScopedJavaLocalRef<jstring> cancel_button_text =
base::android::ConvertUTF16ToJavaString(
env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_CANCEL));
ScopedJavaLocalRef<jstring> message_text =
ConvertUTF16ToJavaString(env, save_password_delegate->GetMessageText());
ScopedJavaLocalRef<jstring> details_message_text = ConvertUTF16ToJavaString(
......@@ -39,7 +42,7 @@ SavePasswordInfoBar::CreateRenderInfoBar(JNIEnv* env) {
env, GetEnumeratedIconId(), message_text,
save_password_delegate->message_link_range().start(),
save_password_delegate->message_link_range().end(), details_message_text,
ok_button_text));
ok_button_text, cancel_button_text));
java_infobar_.Reset(env, infobar.obj());
return infobar;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment