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_ = view_android->AcquireAnchorView();
+  if (popup_view_.is_null())
+    return;
 
   java_object_.Reset(Java_AutofillPopupBridge_create(
-      env, reinterpret_cast<intptr_t>(this),
-      view_android->GetWindowAndroid()->GetJavaObject().obj(),
-      view_android->GetViewAndroidDelegate().obj()));
+      env, popup_view_.view(env).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();
-  Java_AutofillPopupBridge_dismiss(env, java_object_.obj());
+  if (!java_object_.is_null()) {
+    Java_AutofillPopupBridge_dismiss(env, java_object_.obj());
+  } else {
+    // Hide() should delete |this| either via Java dismiss or directly.
+    delete this;
+  }
 }
 
 void AutofillPopupViewAndroid::UpdateBoundsAndRedrawPopup() {
+  if (java_object_.is_null() || popup_view_.is_null())

[Ted C, 2016/07/27 20:10:47]

we are only null checking popup_view here because this is still a "valid" object
even is Show fails above right?  Ideally, we'd never call this in the
popup_view_ == null state, but I guess that requires broader changes in the
autofill code?

[Jinsuk Kim, 2016/07/29 06:09:13]

That's correct. Added the null checking in defensive manner here since I was not
certain if this method won't be called in the state where |popup_view_| is not
set. Moved it down below as per the comment from Bo.

+    return;
+
+  ui::ViewAndroid* view_android = controller_->container_view();
+
+  DCHECK(view_android);
   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());
+  view_android->SetAnchorRect(popup_view_.view(env),

[boliu, 2016/07/27 16:20:26]

need null check

[Ted C, 2016/07/27 20:10:47]

for view_android right?  popup_view_ is null checked above

[Jinsuk Kim, 2016/07/29 06:09:13]

Oh what Bo means by that is I need to change the way to do the null checking for
this weak reference.

+                              controller_->element_bounds());
 
   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(
@@ skipping 26 matching lines @@
     jint list_index) {
   // Race: Hide() may have already run.
   if (controller_)
     controller_->AcceptSuggestion(list_index);
 }
 
 void AutofillPopupViewAndroid::DeletionRequested(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj,
     jint list_index) {
-  if (!controller_)
+  if (!controller_ || java_object_.is_null())
     return;
 
   base::string16 confirmation_title, confirmation_body;
   if (!controller_->GetRemovalConfirmationText(list_index, &confirmation_title,
           &confirmation_body)) {
     return;
   }
 
   deleting_index_ = list_index;
   Java_AutofillPopupBridge_confirmDeletion(
@@ skipping 34 matching lines @@
 // static
 AutofillPopupView* AutofillPopupView::Create(
     AutofillPopupController* controller) {
   if (IsKeyboardAccessoryEnabled())
     return new AutofillKeyboardAccessoryView(controller);
 
   return new AutofillPopupViewAndroid(controller);
 }
 
 }  // namespace autofill