chrome/browser/ui/android/autofill/credit_card_scanner_view_android.cc - Issue 2800833003: Revert of Android: Remove GetApplicationContext part 2

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/credit_card_scanner_view_android.cc

Issue 2800833003: Revert of Android: Remove GetApplicationContext part 2 (Closed)

Patch Set: Created 3 years, 8 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/speech/tts_android.cc ('k') | chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeSigninUtils.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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

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

index 729837c354ea0959fe5f7d4c89905ea2472ea4fb..94292efa9678bd9b8d1f1db7d1dbfe1bbed4baef 100644

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

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

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

#include <memory>

+#include "base/android/context_utils.h"

#include "base/android/jni_android.h"

#include "base/android/jni_string.h"

#include "base/feature_list.h"

@@ -28,7 +29,8 @@

bool CreditCardScannerView::CanShow() {

JNIEnv* env = base::android::AttachCurrentThread();

base::android::ScopedJavaGlobalRef<jobject> java_object(

- Java_CreditCardScannerBridge_create(env, 0, nullptr));

+ Java_CreditCardScannerBridge_create(

+ env, 0, base::android::GetApplicationContext(), nullptr));

return Java_CreditCardScannerBridge_canScan(env, java_object);

}

@@ -52,6 +54,7 @@

java_object_(Java_CreditCardScannerBridge_create(

base::android::AttachCurrentThread(),

reinterpret_cast<intptr_t>(this),

+ base::android::GetApplicationContext(),

web_contents->GetJavaWebContents())) {}

CreditCardScannerViewAndroid::~CreditCardScannerViewAndroid() {}