chrome/browser/android/chrome_jni_registrar.cc - Issue 756333003: Prompt for unmasking Wallet credit card on Android

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/android/chrome_jni_registrar.cc

Issue 756333003: Prompt for unmasking Wallet credit card on Android (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: merge conflicts Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: chrome/browser/android/chrome_jni_registrar.cc

diff --git a/chrome/browser/android/chrome_jni_registrar.cc b/chrome/browser/android/chrome_jni_registrar.cc

index 1d033fd1847befb2f087eb5aade2a00e59282728..ea8e05fea1d873c8522e2eadac324b00a7946be7 100644

--- a/chrome/browser/android/chrome_jni_registrar.cc

+++ b/chrome/browser/android/chrome_jni_registrar.cc

@@ -61,6 +61,7 @@

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

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

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

+#include "chrome/browser/ui/android/autofill/instrument_unmask_prompt_view_android.h"

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

#include "chrome/browser/ui/android/chrome_http_auth_handler.h"

#include "chrome/browser/ui/android/context_menu_helper.h"

@@ -160,6 +161,8 @@ static base::android::RegistrationMethod kChromeRegisteredMethods[] = {

{ "GeneratedPasswordSavedInfoBarDelegate",

RegisterGeneratedPasswordSavedInfoBarDelegate },

{ "InfoBarContainer", RegisterInfoBarContainer },

+ { "InstrumentUnmaskPrompt",

+ autofill::InstrumentUnmaskPromptViewAndroid::Register },

{ "InvalidationServiceFactory",

invalidation::InvalidationServiceFactoryAndroid::Register },

{ "ShortcutHelper", ShortcutHelper::RegisterShortcutHelper },