OLD | NEW |
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 "components/autofill/core/browser/credit_card.h" |
| 16 #include "components/autofill/core/browser/field_types.h" |
15 #include "content/public/browser/android/content_view_core.h" | 17 #include "content/public/browser/android/content_view_core.h" |
16 #include "jni/CreditCardScanner_jni.h" | 18 #include "jni/CreditCardScanner_jni.h" |
17 #include "ui/android/view_android.h" | 19 #include "ui/android/view_android.h" |
18 #include "ui/android/window_android.h" | 20 #include "ui/android/window_android.h" |
19 | 21 |
20 using base::android::JavaParamRef; | 22 using base::android::JavaParamRef; |
21 | 23 |
22 namespace autofill { | 24 namespace autofill { |
23 | 25 |
24 // static | 26 // static |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
60 | 62 |
61 void CreditCardScannerViewAndroid::ScanCancelled( | 63 void CreditCardScannerViewAndroid::ScanCancelled( |
62 JNIEnv* env, | 64 JNIEnv* env, |
63 const JavaParamRef<jobject>& object) { | 65 const JavaParamRef<jobject>& object) { |
64 delegate_->ScanCancelled(); | 66 delegate_->ScanCancelled(); |
65 } | 67 } |
66 | 68 |
67 void CreditCardScannerViewAndroid::ScanCompleted( | 69 void CreditCardScannerViewAndroid::ScanCompleted( |
68 JNIEnv* env, | 70 JNIEnv* env, |
69 const JavaParamRef<jobject>& object, | 71 const JavaParamRef<jobject>& object, |
| 72 const JavaParamRef<jstring>& card_holder_name, |
70 const JavaParamRef<jstring>& card_number, | 73 const JavaParamRef<jstring>& card_number, |
71 jint expiration_month, | 74 jint expiration_month, |
72 jint expiration_year) { | 75 jint expiration_year) { |
73 delegate_->ScanCompleted( | 76 CreditCard card(base::android::ConvertJavaStringToUTF16(env, card_number), |
74 base::android::ConvertJavaStringToUTF16(env, card_number), | |
75 static_cast<int>(expiration_month), static_cast<int>(expiration_year)); | 77 static_cast<int>(expiration_month), static_cast<int>(expiration_year)); |
| 78 card.SetRawInfo(CREDIT_CARD_NAME_FULL, |
| 79 base::android::ConvertJavaStringToUTF16(env, card_holder_name)); |
| 80 delegate_->ScanCompleted(card); |
76 } | 81 } |
77 | 82 |
78 void CreditCardScannerViewAndroid::Show() { | 83 void CreditCardScannerViewAndroid::Show() { |
79 JNIEnv* env = base::android::AttachCurrentThread(); | 84 JNIEnv* env = base::android::AttachCurrentThread(); |
80 Java_CreditCardScanner_scan(env, java_object_); | 85 Java_CreditCardScanner_scan(env, java_object_); |
81 } | 86 } |
82 | 87 |
83 } // namespace autofill | 88 } // namespace autofill |
OLD | NEW |