Chromium Code Reviews| 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/guid.h" | |
| 12 #include "base/memory/ptr_util.h" | 13 #include "base/memory/ptr_util.h" |
| 13 #include "chrome/browser/ui/android/view_android_helper.h" | 14 #include "chrome/browser/ui/android/view_android_helper.h" |
| 14 #include "chrome/browser/ui/autofill/credit_card_scanner_view_delegate.h" | 15 #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/credit_card.h" |
| 16 #include "components/autofill/core/browser/field_types.h" | 17 #include "components/autofill/core/browser/field_types.h" |
| 17 #include "content/public/browser/android/content_view_core.h" | 18 #include "content/public/browser/android/content_view_core.h" |
| 18 #include "jni/CreditCardScanner_jni.h" | 19 #include "jni/CreditCardScanner_jni.h" |
| 19 #include "ui/android/view_android.h" | 20 #include "ui/android/view_android.h" |
| 20 #include "ui/android/window_android.h" | 21 #include "ui/android/window_android.h" |
| 21 | 22 |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 66 delegate_->ScanCancelled(); | 67 delegate_->ScanCancelled(); |
| 67 } | 68 } |
| 68 | 69 |
| 69 void CreditCardScannerViewAndroid::ScanCompleted( | 70 void CreditCardScannerViewAndroid::ScanCompleted( |
| 70 JNIEnv* env, | 71 JNIEnv* env, |
| 71 const JavaParamRef<jobject>& object, | 72 const JavaParamRef<jobject>& object, |
| 72 const JavaParamRef<jstring>& card_holder_name, | 73 const JavaParamRef<jstring>& card_holder_name, |
| 73 const JavaParamRef<jstring>& card_number, | 74 const JavaParamRef<jstring>& card_number, |
| 74 jint expiration_month, | 75 jint expiration_month, |
| 75 jint expiration_year) { | 76 jint expiration_year) { |
| 76 CreditCard card(base::android::ConvertJavaStringToUTF16(env, card_number), | 77 CreditCard card(base::GenerateGUID(), std::string()); |
|
msw
2016/08/23 18:23:03
optional nit: use default ctor instead and nix bas
please use gerrit instead
2016/08/23 18:42:32
Done.
| |
| 77 static_cast<int>(expiration_month), static_cast<int>(expiration_year)); | 78 card.SetNumber(base::android::ConvertJavaStringToUTF16(env, card_number)); |
| 78 card.SetRawInfo(CREDIT_CARD_NAME_FULL, | 79 card.SetExpirationMonth(static_cast<int>(expiration_month)); |
| 80 card.SetExpirationYear(static_cast<int>(expiration_year)); | |
| 81 card.SetRawInfo( | |
| 82 CREDIT_CARD_NAME_FULL, | |
| 79 base::android::ConvertJavaStringToUTF16(env, card_holder_name)); | 83 base::android::ConvertJavaStringToUTF16(env, card_holder_name)); |
| 80 delegate_->ScanCompleted(card); | 84 delegate_->ScanCompleted(card); |
| 81 } | 85 } |
| 82 | 86 |
| 83 void CreditCardScannerViewAndroid::Show() { | 87 void CreditCardScannerViewAndroid::Show() { |
| 84 JNIEnv* env = base::android::AttachCurrentThread(); | 88 JNIEnv* env = base::android::AttachCurrentThread(); |
| 85 Java_CreditCardScanner_scan(env, java_object_); | 89 Java_CreditCardScanner_scan(env, java_object_); |
| 86 } | 90 } |
| 87 | 91 |
| 88 } // namespace autofill | 92 } // namespace autofill |
| OLD | NEW |