| 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 15b26c62e11b63f40d7621df52e879ceeaaba7a8..b0a6c9cce9ef293d848792878c738a33142b78c2 100644
|
| --- a/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc
|
| +++ b/chrome/browser/ui/android/autofill/autofill_popup_view_android.cc
|
| @@ -25,11 +25,10 @@ namespace autofill {
|
|
|
| AutofillPopupViewAndroid::AutofillPopupViewAndroid(
|
| AutofillPopupController* controller)
|
| - : controller_(controller),
|
| + : AutofillPopupView(controller),
|
| + controller_(controller),
|
| deleting_index_(-1) {}
|
|
|
| -AutofillPopupViewAndroid::~AutofillPopupViewAndroid() {}
|
| -
|
| void AutofillPopupViewAndroid::Show() {
|
| JNIEnv* env = base::android::AttachCurrentThread();
|
| ui::ViewAndroid* view_android = controller_->container_view();
|
| @@ -74,8 +73,8 @@ void AutofillPopupViewAndroid::UpdateBoundsAndRedrawPopup() {
|
|
|
| const autofill::Suggestion& suggestion = controller_->GetSuggestionAt(i);
|
| if (!suggestion.icon.empty()) {
|
| - android_icon_id = ResourceMapper::MapFromChromiumId(
|
| - controller_->GetIconResourceID(suggestion.icon));
|
| + android_icon_id =
|
| + ResourceMapper::MapFromChromiumId(GetIconResourceID(suggestion.icon));
|
| }
|
|
|
| bool deletable =
|
|
|