chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.cc - Issue 873313011: Update Android card unmasking prompt for the expiration date case.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.cc

Issue 873313011: Update Android card unmasking prompt for the expiration date case. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 11 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

« no previous file with comments | « chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h ('k') | chrome/browser/ui/autofill/card_unmask_prompt_controller_impl.cc » ('j') | ui/android/java/res/layout/autofill_card_unmask_prompt.xml » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.cc

diff --git a/chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.cc b/chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.cc

index 7a974762bcf26e28e52f1e394384ff76b7f825db..69b0c37fbb192050896b820a09e21de521d59593 100644

--- a/chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.cc

+++ b/chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.cc

@@ -4,6 +4,7 @@

#include "chrome/browser/ui/android/autofill/card_unmask_prompt_view_android.h"

+#include "chrome/browser/android/resource_mapper.h"

#include "chrome/browser/ui/autofill/card_unmask_prompt_controller.h"

#include "content/public/browser/web_contents.h"

#include "jni/CardUnmaskBridge_jni.h"

@@ -43,7 +44,8 @@ void CardUnmaskPromptViewAndroid::Show() {

env, controller_->GetInstructionsMessage());

java_object_.Reset(Java_CardUnmaskBridge_create(

env, reinterpret_cast<intptr_t>(this), dialog_title.obj(),

- instructions.obj(),

+ instructions.obj(), controller_->ShouldRequestExpirationDate(),

+ ResourceMapper::MapFromChromiumId(controller_->GetCvcImageRid()),

view_android->GetWindowAndroid()->GetJavaObject().obj()));

Java_CardUnmaskBridge_show(env, java_object_.obj());

@@ -58,11 +60,13 @@ bool CardUnmaskPromptViewAndroid::CheckUserInputValidity(JNIEnv* env,

void CardUnmaskPromptViewAndroid::OnUserInput(JNIEnv* env,

jobject obj,

- jstring response) {

+ jstring cvc,

+ jstring month,

+ jstring year) {

controller_->OnUnmaskResponse(

- base::android::ConvertJavaStringToUTF16(env, response),

- base::string16(),

- base::string16());

+ base::android::ConvertJavaStringToUTF16(env, cvc),

+ base::android::ConvertJavaStringToUTF16(env, month),

+ base::android::ConvertJavaStringToUTF16(env, year));

}

void CardUnmaskPromptViewAndroid::PromptDismissed(JNIEnv* env, jobject obj) {