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

Side by Side Diff: chrome/browser/ui/android/infobars/autofill_save_card_infobar.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 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_save_card_infobar.h" 5 #include "chrome/browser/ui/android/infobars/autofill_save_card_infobar.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 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 GetSaveCardDelegate(); 54 GetSaveCardDelegate();
55 ScopedJavaLocalRef<jobject> java_bitmap; 55 ScopedJavaLocalRef<jobject> java_bitmap;
56 if (delegate->GetIconId() == infobars::InfoBarDelegate::kNoIconID && 56 if (delegate->GetIconId() == infobars::InfoBarDelegate::kNoIconID &&
57 !delegate->GetIcon().IsEmpty()) { 57 !delegate->GetIcon().IsEmpty()) {
58 java_bitmap = gfx::ConvertToJavaBitmap(delegate->GetIcon().ToSkBitmap()); 58 java_bitmap = gfx::ConvertToJavaBitmap(delegate->GetIcon().ToSkBitmap());
59 } 59 }
60 60
61 base::android::ScopedJavaLocalRef<jobject> java_delegate = 61 base::android::ScopedJavaLocalRef<jobject> java_delegate =
62 Java_AutofillSaveCardInfoBar_create( 62 Java_AutofillSaveCardInfoBar_create(
63 env, reinterpret_cast<intptr_t>(this), GetEnumeratedIconId(), 63 env, reinterpret_cast<intptr_t>(this), GetEnumeratedIconId(),
64 java_bitmap.obj(), 64 java_bitmap, base::android::ConvertUTF16ToJavaString(
65 env, delegate->GetMessageText()),
66 base::android::ConvertUTF16ToJavaString(env, delegate->GetLinkText()),
65 base::android::ConvertUTF16ToJavaString( 67 base::android::ConvertUTF16ToJavaString(
66 env, delegate->GetMessageText()).obj(), 68 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_OK)),
67 base::android::ConvertUTF16ToJavaString( 69 base::android::ConvertUTF16ToJavaString(
68 env, delegate->GetLinkText()).obj(), 70 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_CANCEL)));
69 base::android::ConvertUTF16ToJavaString(
70 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_OK)).obj(),
71 base::android::ConvertUTF16ToJavaString(
72 env, GetTextFor(ConfirmInfoBarDelegate::BUTTON_CANCEL)).obj());
73 71
74 Java_AutofillSaveCardInfoBar_addDetail( 72 Java_AutofillSaveCardInfoBar_addDetail(
75 env, java_delegate.obj(), 73 env, java_delegate,
76 ResourceMapper::MapFromChromiumId(delegate->issuer_icon_id()), 74 ResourceMapper::MapFromChromiumId(delegate->issuer_icon_id()),
77 base::android::ConvertUTF16ToJavaString( 75 base::android::ConvertUTF16ToJavaString(env, delegate->card_label()),
78 env, delegate->card_label()).obj(), 76 base::android::ConvertUTF16ToJavaString(env, delegate->card_sub_label()));
79 base::android::ConvertUTF16ToJavaString(
80 env, delegate->card_sub_label()).obj());
81 77
82 for (const auto& line : delegate->legal_messages()) { 78 for (const auto& line : delegate->legal_messages()) {
83 Java_AutofillSaveCardInfoBar_addLegalMessageLine( 79 Java_AutofillSaveCardInfoBar_addLegalMessageLine(
84 env, java_delegate.obj(), 80 env, java_delegate,
85 base::android::ConvertUTF16ToJavaString(env, line.text()).obj()); 81 base::android::ConvertUTF16ToJavaString(env, line.text()));
86 for (const auto& link : line.links()) { 82 for (const auto& link : line.links()) {
87 Java_AutofillSaveCardInfoBar_addLinkToLastLegalMessageLine( 83 Java_AutofillSaveCardInfoBar_addLinkToLastLegalMessageLine(
88 env, java_delegate.obj(), link.range.start(), link.range.end(), 84 env, java_delegate, link.range.start(), link.range.end(),
89 base::android::ConvertUTF8ToJavaString(env, link.url.spec()).obj()); 85 base::android::ConvertUTF8ToJavaString(env, link.url.spec()));
90 } 86 }
91 } 87 }
92 88
93 return java_delegate; 89 return java_delegate;
94 } 90 }
95 91
96 autofill::AutofillSaveCardInfoBarDelegateMobile* 92 autofill::AutofillSaveCardInfoBarDelegateMobile*
97 AutofillSaveCardInfoBar::GetSaveCardDelegate() { 93 AutofillSaveCardInfoBar::GetSaveCardDelegate() {
98 return static_cast<autofill::AutofillSaveCardInfoBarDelegateMobile*>( 94 return static_cast<autofill::AutofillSaveCardInfoBarDelegateMobile*>(
99 GetDelegate()); 95 GetDelegate());
100 } 96 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698