[Autofill] Move functions from the AutofillPopupController to AutofillPopupLayoutModel

chrome/browser/ui/android/autofill/autofill_popup_view_android.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/android/autofill/autofill_popup_view_android.h"
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/command_line.h"
 #include "chrome/browser/android/resource_mapper.h"
 #include "chrome/browser/ui/android/autofill/autofill_keyboard_accessory_view.h"
 #include "chrome/browser/ui/android/view_android_helper.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller.h"
 #include "components/autofill/core/browser/suggestion.h"
 #include "components/autofill/core/common/autofill_util.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "jni/AutofillPopupBridge_jni.h"
 #include "ui/android/view_android.h"
 #include "ui/android/window_android.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/android/java_bitmap.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 namespace autofill {
 
 AutofillPopupViewAndroid::AutofillPopupViewAndroid(
     AutofillPopupController* controller)
-    : controller_(controller),
-      deleting_index_(-1) {}
+    : view_helper_(controller), controller_(controller), deleting_index_(-1) {}
 
 AutofillPopupViewAndroid::~AutofillPopupViewAndroid() {}
 
 void AutofillPopupViewAndroid::Show() {
   JNIEnv* env = base::android::AttachCurrentThread();
   ui::ViewAndroid* view_android = controller_->container_view();
 
   DCHECK(view_android);
 
   java_object_.Reset(Java_AutofillPopupBridge_create(
@@ skipping 28 matching lines @@
     ScopedJavaLocalRef<jstring> value = base::android::ConvertUTF16ToJavaString(
         env, controller_->GetElidedValueAt(i));
     ScopedJavaLocalRef<jstring> label =
         base::android::ConvertUTF16ToJavaString(
             env, controller_->GetElidedLabelAt(i));
     int android_icon_id = 0;
 
     const autofill::Suggestion& suggestion = controller_->GetSuggestionAt(i);
     if (!suggestion.icon.empty()) {
       android_icon_id = ResourceMapper::MapFromChromiumId(
-          controller_->GetIconResourceID(suggestion.icon));
+          view_helper_.GetIconResourceID(suggestion.icon));
     }
 
     bool deletable =
         controller_->GetRemovalConfirmationText(i, nullptr, nullptr);
     Java_AutofillPopupBridge_addToAutofillSuggestionArray(
         env,
         data_array.obj(),
         i,
         value.obj(),
         label.obj(),
         android_icon_id,
         suggestion.frontend_id,
         deletable);
   }
 
   Java_AutofillPopupBridge_show(
       env, java_object_.obj(), data_array.obj(), controller_->IsRTL());
 }
 
+int AutofillPopupViewAndroid::LineFromY(int y) {
+  return view_helper_.LineFromY(y);
+}
+
+gfx::Rect AutofillPopupViewAndroid::GetPopupBounds() {
+  return view_helper_.popup_bounds();
+}
+
 void AutofillPopupViewAndroid::SuggestionSelected(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint list_index) {
   // Race: Hide() may have already run.
   if (controller_)
     controller_->AcceptSuggestion(list_index);
 }
 
 void AutofillPopupViewAndroid::DeletionRequested(
@@ skipping 48 matching lines @@
 // static
 AutofillPopupView* AutofillPopupView::Create(
     AutofillPopupController* controller) {
   if (IsKeyboardAccessoryEnabled())
     return new AutofillKeyboardAccessoryView(controller);
 
   return new AutofillPopupViewAndroid(controller);
 }
 
 }  // namespace autofill