Factor out ContentViewAndroidDelegate

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

 // Copyright 2014 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/password_generation_popup_view_android.h"
 
 #include <jni.h>
 
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
@@ skipping 17 matching lines @@
 void PasswordGenerationPopupViewAndroid::SavedPasswordsLinkClicked(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
   if (controller_)
     controller_->OnSavedPasswordsLinkClicked();
 }
 
 void PasswordGenerationPopupViewAndroid::Dismissed(
     JNIEnv* env,
     const JavaParamRef<jobject>& obj) {
-  if (controller_)
+
+  if (controller_) {

[no sievers, 2016/07/14 23:14:31]

We have to be careful not to leak the View (by leaving it attached).

Maybe it's good enough to also remove it from Hide()?

Should we also reset |popup_|?

[Jinsuk Kim, 2016/07/15 05:46:26]

Done. 

+    ui::ViewAndroid* view_android = controller_->container_view();
+    DCHECK(view_android);
+    view_android->RemoveAnchorView(popup_.obj());
+
     controller_->ViewDestroyed();
-
+  }
   delete this;
 }
 
 void PasswordGenerationPopupViewAndroid::PasswordSelected(
     JNIEnv* env,
     const JavaParamRef<jobject>& object) {
   if (controller_)
     controller_->PasswordAccepted();
 }
 
 // static
 bool PasswordGenerationPopupViewAndroid::Register(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 PasswordGenerationPopupViewAndroid::~PasswordGenerationPopupViewAndroid() {}
 
 void PasswordGenerationPopupViewAndroid::Show() {
   JNIEnv* env = base::android::AttachCurrentThread();
   ui::ViewAndroid* view_android = controller_->container_view();
 
   DCHECK(view_android);
 
+  popup_.Reset(view_android->AcquireAnchorView());
   java_object_.Reset(Java_PasswordGenerationPopupBridge_create(
-      env, reinterpret_cast<intptr_t>(this),
-      view_android->GetWindowAndroid()->GetJavaObject().obj(),
-      view_android->GetViewAndroidDelegate().obj()));
+      env, popup_.obj(), controller_->element_bounds().width(),
+      reinterpret_cast<intptr_t>(this),
+      view_android->GetWindowAndroid()->GetJavaObject().obj()));
 
   UpdateBoundsAndRedrawPopup();
 }
 
 void PasswordGenerationPopupViewAndroid::Hide() {
   controller_ = NULL;
   JNIEnv* env = base::android::AttachCurrentThread();
   Java_PasswordGenerationPopupBridge_hide(env, java_object_.obj());
 }
 
 gfx::Size PasswordGenerationPopupViewAndroid::GetPreferredSizeOfPasswordView() {
   static const int kUnusedSize = 0;
   return gfx::Size(kUnusedSize, kUnusedSize);
 }
 
 void PasswordGenerationPopupViewAndroid::UpdateBoundsAndRedrawPopup() {
   JNIEnv* env = base::android::AttachCurrentThread();
-  Java_PasswordGenerationPopupBridge_setAnchorRect(
-      env,
-      java_object_.obj(),
-      controller_->element_bounds().x(),
-      controller_->element_bounds().y(),
-      controller_->element_bounds().width(),
-      controller_->element_bounds().height());
+  ui::ViewAndroid* view_android = controller_->container_view();
 
+  DCHECK(view_android);
+  view_android->SetAnchorRect(popup_.obj(), controller_->element_bounds());
   ScopedJavaLocalRef<jstring> password =
       base::android::ConvertUTF16ToJavaString(env, controller_->password());
   ScopedJavaLocalRef<jstring> suggestion =
       base::android::ConvertUTF16ToJavaString(
           env, controller_->SuggestedText());
   ScopedJavaLocalRef<jstring> help =
       base::android::ConvertUTF16ToJavaString(env, controller_->HelpText());
 
   Java_PasswordGenerationPopupBridge_show(
       env,
@@ skipping 15 matching lines @@
   return false;
 }
 
 // static
 PasswordGenerationPopupView* PasswordGenerationPopupView::Create(
     PasswordGenerationPopupController* controller) {
   return new PasswordGenerationPopupViewAndroid(controller);
 }
 
 }  // namespace autofill