Index: chrome/browser/ui/android/autofill/autofill_popup_view_android.cc |
diff --git a/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc b/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc |
index 25e4bead143072b3ec4253fdcf0ccd2aee975e74..298ab1206afffa3567a7d773f69e6a2f0152536c 100644 |
--- a/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc |
+++ b/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc |
@@ -12,6 +12,8 @@ |
#include "jni/AutofillPopupBridge_jni.h" |
#include "ui/base/android/view_android.h" |
#include "ui/base/android/window_android.h" |
+#include "ui/base/resource/resource_bundle.h" |
+#include "ui/gfx/android/java_bitmap.h" |
#include "ui/gfx/rect.h" |
namespace autofill { |
@@ -65,12 +67,21 @@ void AutofillPopupViewAndroid::UpdateBoundsAndRedrawPopup() { |
ScopedJavaLocalRef<jstring> subtext = |
base::android::ConvertUTF16ToJavaString(env, |
controller_->subtexts()[i]); |
+ ScopedJavaLocalRef<jobject> icon; |
+ if (!controller_->icons()[i].empty()) { |
+ int icon_id = controller_->GetIconResourceID(controller_->icons()[i]); |
+ DCHECK_NE(-1, icon_id); |
+ ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); |
+ icon = gfx::ConvertToJavaBitmap(rb.GetImageNamed(icon_id).ToSkBitmap()); |
aruslan
2014/08/08 22:06:39
1. Get all necessary resolutions for every image y
|
+ } |
+ |
Java_AutofillPopupBridge_addToAutofillSuggestionArray( |
env, |
data_array.obj(), |
i, |
name.obj(), |
subtext.obj(), |
+ icon.obj(), |
controller_->identifiers()[i]); |
} |