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

Side by Side Diff: chrome/browser/ui/android/autofill/credit_card_scanner_view_android.cc

Issue 2237943002: Remove now-unnecessary .obj() in Java method calls. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@switch-context
Patch Set: Rebase *again* :( Created 4 years, 4 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 unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h" 5 #include "chrome/browser/ui/android/autofill/credit_card_scanner_view_android.h"
6 6
7 #include <memory> 7 #include <memory>
8 8
9 #include "base/android/context_utils.h" 9 #include "base/android/context_utils.h"
10 #include "base/android/jni_android.h" 10 #include "base/android/jni_android.h"
11 #include "base/android/jni_string.h" 11 #include "base/android/jni_string.h"
12 #include "base/memory/ptr_util.h" 12 #include "base/memory/ptr_util.h"
13 #include "chrome/browser/ui/android/view_android_helper.h" 13 #include "chrome/browser/ui/android/view_android_helper.h"
14 #include "chrome/browser/ui/autofill/credit_card_scanner_view_delegate.h" 14 #include "chrome/browser/ui/autofill/credit_card_scanner_view_delegate.h"
15 #include "content/public/browser/android/content_view_core.h" 15 #include "content/public/browser/android/content_view_core.h"
16 #include "jni/CreditCardScanner_jni.h" 16 #include "jni/CreditCardScanner_jni.h"
17 #include "ui/android/view_android.h" 17 #include "ui/android/view_android.h"
18 #include "ui/android/window_android.h" 18 #include "ui/android/window_android.h"
19 19
20 using base::android::JavaParamRef; 20 using base::android::JavaParamRef;
21 21
22 namespace autofill { 22 namespace autofill {
23 23
24 // static 24 // static
25 bool CreditCardScannerView::CanShow() { 25 bool CreditCardScannerView::CanShow() {
26 JNIEnv* env = base::android::AttachCurrentThread(); 26 JNIEnv* env = base::android::AttachCurrentThread();
27 base::android::ScopedJavaGlobalRef<jobject> java_object( 27 base::android::ScopedJavaGlobalRef<jobject> java_object(
28 Java_CreditCardScanner_create( 28 Java_CreditCardScanner_create(
29 env, 0, base::android::GetApplicationContext(), nullptr)); 29 env, 0, base::android::GetApplicationContext(), nullptr));
30 return Java_CreditCardScanner_canScan(env, java_object.obj()); 30 return Java_CreditCardScanner_canScan(env, java_object);
31 } 31 }
32 32
33 // static 33 // static
34 std::unique_ptr<CreditCardScannerView> CreditCardScannerView::Create( 34 std::unique_ptr<CreditCardScannerView> CreditCardScannerView::Create(
35 const base::WeakPtr<CreditCardScannerViewDelegate>& delegate, 35 const base::WeakPtr<CreditCardScannerViewDelegate>& delegate,
36 content::WebContents* web_contents) { 36 content::WebContents* web_contents) {
37 return base::WrapUnique( 37 return base::WrapUnique(
38 new CreditCardScannerViewAndroid(delegate, web_contents)); 38 new CreditCardScannerViewAndroid(delegate, web_contents));
39 } 39 }
40 40
41 // static 41 // static
42 bool CreditCardScannerViewAndroid::Register(JNIEnv* env) { 42 bool CreditCardScannerViewAndroid::Register(JNIEnv* env) {
43 return RegisterNativesImpl(env); 43 return RegisterNativesImpl(env);
44 } 44 }
45 45
46 CreditCardScannerViewAndroid::CreditCardScannerViewAndroid( 46 CreditCardScannerViewAndroid::CreditCardScannerViewAndroid(
47 const base::WeakPtr<CreditCardScannerViewDelegate>& delegate, 47 const base::WeakPtr<CreditCardScannerViewDelegate>& delegate,
48 content::WebContents* web_contents) 48 content::WebContents* web_contents)
49 : delegate_(delegate), 49 : delegate_(delegate),
50 java_object_(Java_CreditCardScanner_create( 50 java_object_(Java_CreditCardScanner_create(
51 base::android::AttachCurrentThread(), 51 base::android::AttachCurrentThread(),
52 reinterpret_cast<intptr_t>(this), 52 reinterpret_cast<intptr_t>(this),
53 base::android::GetApplicationContext(), 53 base::android::GetApplicationContext(),
54 ViewAndroidHelper::FromWebContents(web_contents)->GetViewAndroid() 54 ViewAndroidHelper::FromWebContents(web_contents)
55 ->GetWindowAndroid()->GetJavaObject().obj())) {} 55 ->GetViewAndroid()
56 ->GetWindowAndroid()
57 ->GetJavaObject())) {}
56 58
57 CreditCardScannerViewAndroid::~CreditCardScannerViewAndroid() {} 59 CreditCardScannerViewAndroid::~CreditCardScannerViewAndroid() {}
58 60
59 void CreditCardScannerViewAndroid::ScanCancelled( 61 void CreditCardScannerViewAndroid::ScanCancelled(
60 JNIEnv* env, 62 JNIEnv* env,
61 const JavaParamRef<jobject>& object) { 63 const JavaParamRef<jobject>& object) {
62 delegate_->ScanCancelled(); 64 delegate_->ScanCancelled();
63 } 65 }
64 66
65 void CreditCardScannerViewAndroid::ScanCompleted( 67 void CreditCardScannerViewAndroid::ScanCompleted(
66 JNIEnv* env, 68 JNIEnv* env,
67 const JavaParamRef<jobject>& object, 69 const JavaParamRef<jobject>& object,
68 const JavaParamRef<jstring>& card_number, 70 const JavaParamRef<jstring>& card_number,
69 jint expiration_month, 71 jint expiration_month,
70 jint expiration_year) { 72 jint expiration_year) {
71 delegate_->ScanCompleted( 73 delegate_->ScanCompleted(
72 base::android::ConvertJavaStringToUTF16(env, card_number), 74 base::android::ConvertJavaStringToUTF16(env, card_number),
73 static_cast<int>(expiration_month), static_cast<int>(expiration_year)); 75 static_cast<int>(expiration_month), static_cast<int>(expiration_year));
74 } 76 }
75 77
76 void CreditCardScannerViewAndroid::Show() { 78 void CreditCardScannerViewAndroid::Show() {
77 JNIEnv* env = base::android::AttachCurrentThread(); 79 JNIEnv* env = base::android::AttachCurrentThread();
78 Java_CreditCardScanner_scan(env, java_object_.obj()); 80 Java_CreditCardScanner_scan(env, java_object_);
79 } 81 }
80 82
81 } // namespace autofill 83 } // namespace autofill
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698