| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/infobars/autofill_credit_card_filling_infoba
r.h" | 5 #include "chrome/browser/ui/android/infobars/autofill_credit_card_filling_infoba
r.h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/android/jni_android.h" | 9 #include "base/android/jni_android.h" |
| 10 #include "base/android/jni_string.h" | 10 #include "base/android/jni_string.h" |
| (...skipping 22 matching lines...) Expand all Loading... |
| 33 GetDelegate()); | 33 GetDelegate()); |
| 34 ScopedJavaLocalRef<jobject> java_bitmap; | 34 ScopedJavaLocalRef<jobject> java_bitmap; |
| 35 if (delegate->GetIconId() == infobars::InfoBarDelegate::kNoIconID && | 35 if (delegate->GetIconId() == infobars::InfoBarDelegate::kNoIconID && |
| 36 !delegate->GetIcon().IsEmpty()) { | 36 !delegate->GetIcon().IsEmpty()) { |
| 37 java_bitmap = gfx::ConvertToJavaBitmap(delegate->GetIcon().ToSkBitmap()); | 37 java_bitmap = gfx::ConvertToJavaBitmap(delegate->GetIcon().ToSkBitmap()); |
| 38 } | 38 } |
| 39 | 39 |
| 40 base::android::ScopedJavaLocalRef<jobject> java_delegate = | 40 base::android::ScopedJavaLocalRef<jobject> java_delegate = |
| 41 Java_AutofillCreditCardFillingInfoBar_create( | 41 Java_AutofillCreditCardFillingInfoBar_create( |
| 42 env, reinterpret_cast<intptr_t>(this), GetEnumeratedIconId(), | 42 env, reinterpret_cast<intptr_t>(this), GetEnumeratedIconId(), |
| 43 java_bitmap.obj(), | 43 java_bitmap, base::android::ConvertUTF16ToJavaString( |
| 44 env, delegate->GetMessageText()), |
| 44 base::android::ConvertUTF16ToJavaString( | 45 base::android::ConvertUTF16ToJavaString( |
| 45 env, delegate->GetMessageText()) | 46 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_OK)), |
| 46 .obj(), | |
| 47 base::android::ConvertUTF16ToJavaString( | 47 base::android::ConvertUTF16ToJavaString( |
| 48 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_OK)) | 48 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_CANCEL))); |
| 49 .obj(), | |
| 50 base::android::ConvertUTF16ToJavaString( | |
| 51 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_CANCEL)) | |
| 52 .obj()); | |
| 53 | 49 |
| 54 Java_AutofillCreditCardFillingInfoBar_addDetail( | 50 Java_AutofillCreditCardFillingInfoBar_addDetail( |
| 55 env, java_delegate.obj(), | 51 env, java_delegate, |
| 56 ResourceMapper::MapFromChromiumId(delegate->issuer_icon_id()), | 52 ResourceMapper::MapFromChromiumId(delegate->issuer_icon_id()), |
| 57 base::android::ConvertUTF16ToJavaString(env, delegate->card_label()) | 53 base::android::ConvertUTF16ToJavaString(env, delegate->card_label()), |
| 58 .obj(), | 54 base::android::ConvertUTF16ToJavaString(env, delegate->card_sub_label())); |
| 59 base::android::ConvertUTF16ToJavaString(env, delegate->card_sub_label()) | |
| 60 .obj()); | |
| 61 | 55 |
| 62 return java_delegate; | 56 return java_delegate; |
| 63 } | 57 } |
| OLD | NEW |