Factor out ContentViewAndroidDelegate

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"
@@ skipping 18 matching lines @@
     AutofillPopupController* 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);
-
+  popup_view_.reset(view_android->AcquireAnchorView());

[no sievers, 2016/07/18 22:14:16]

I'd handle |anchor_view_.view_.is_null()| here and early out.

(Need to handle |java_object_.is_null() then in the code below also.)

[Jinsuk Kim, 2016/07/19 07:08:39]

Done.

   java_object_.Reset(Java_AutofillPopupBridge_create(
-      env, reinterpret_cast<intptr_t>(this),
-      view_android->GetWindowAndroid()->GetJavaObject().obj(),
-      view_android->GetViewAndroidDelegate().obj()));
+      env, popup_view_->obj(), controller_->element_bounds().width(),
+      reinterpret_cast<intptr_t>(this),
+      view_android->GetWindowAndroid()->GetJavaObject().obj()));
 
   UpdateBoundsAndRedrawPopup();
 }
 
 void AutofillPopupViewAndroid::Hide() {
   controller_ = NULL;
   JNIEnv* env = base::android::AttachCurrentThread();
+  popup_view_.reset();

[no sievers, 2016/07/18 22:14:16]

See comment in password_generation_popup_view_android.cc.
(I'm now wondering if we maybe better avoid causing removeView() *before*
onDismiss(). Previously the order was also the opposite.)

[Jinsuk Kim, 2016/07/19 07:08:39]

Done. Removed it as we do not use unique_ptr any more. In other places where I
want to delete the view immediately, I set it to a dummy ScopedAnchorView so
that the move assignment can take care of it.

   Java_AutofillPopupBridge_dismiss(env, java_object_.obj());
 }
 
 void AutofillPopupViewAndroid::UpdateBoundsAndRedrawPopup() {
+  ui::ViewAndroid* view_android = controller_->container_view();
+
+  DCHECK(view_android);
+  view_android->SetAnchorRect(popup_view_->ref(),
+                              controller_->element_bounds());
+
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_AutofillPopupBridge_setAnchorRect(
-      env,
-      java_object_.obj(),
-      controller_->element_bounds().x(),
-      controller_->element_bounds().y(),
-      controller_->element_bounds().width(),
-      controller_->element_bounds().height());
-
   size_t count = controller_->GetLineCount();
   ScopedJavaLocalRef<jobjectArray> data_array =
       Java_AutofillPopupBridge_createAutofillSuggestionArray(env, count);
 
   for (size_t i = 0; i < count; ++i) {
     ScopedJavaLocalRef<jstring> value = base::android::ConvertUTF16ToJavaString(
         env, controller_->GetElidedValueAt(i));
     ScopedJavaLocalRef<jstring> label =
         base::android::ConvertUTF16ToJavaString(
             env, controller_->GetElidedLabelAt(i));
@@ skipping 56 matching lines @@
   if (!controller_)
     return;
 
   CHECK_GE(deleting_index_, 0);
   controller_->RemoveSuggestion(deleting_index_);
 }
 
 void AutofillPopupViewAndroid::PopupDismissed(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
-  if (controller_)
+  if (controller_) {
     controller_->ViewDestroyed();
+  }
 
   delete this;
 }
 
 void AutofillPopupViewAndroid::InvalidateRow(size_t) {}
 
 // static
 bool AutofillPopupViewAndroid::RegisterAutofillPopupViewAndroid(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 // static
 AutofillPopupView* AutofillPopupView::Create(
     AutofillPopupController* controller) {
   if (IsKeyboardAccessoryEnabled())
     return new AutofillKeyboardAccessoryView(controller);
 
   return new AutofillPopupViewAndroid(controller);
 }
 
 }  // namespace autofill