Factor out ContentViewAndroidDelegate

android_webview/native/aw_autofill_client.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 "android_webview/native/aw_autofill_client.h"
 
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_content_browser_client.h"
 #include "android_webview/browser/aw_form_database_service.h"
 #include "android_webview/native/aw_contents.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/logging.h"
 #include "components/autofill/core/browser/autofill_popup_delegate.h"
 #include "components/autofill/core/browser/suggestion.h"
 #include "components/autofill/core/browser/webdata/autofill_webdata_service.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "components/prefs/pref_registry_simple.h"
 #include "components/prefs/pref_service.h"
 #include "components/prefs/pref_service_factory.h"
 #include "components/user_prefs/user_prefs.h"
+#include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/ssl_status.h"
 #include "jni/AwAutofillClient_jni.h"
+#include "ui/android/view_android.h"
 #include "ui/gfx/geometry/rect_f.h"
 
 using base::android::AttachCurrentThread;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ScopedJavaLocalRef;
 using content::WebContents;
 
 DEFINE_WEB_CONTENTS_USER_DATA_KEY(android_webview::AwAutofillClient);
 
 namespace android_webview {
 
 // Ownership: The native object is created (if autofill enabled) and owned by
 // AwContents. The native object creates the java peer which handles most
 // autofill functionality at the java side. The java peer is owned by Java
 // AwContents. The native object only maintains a weak ref to it.
 AwAutofillClient::AwAutofillClient(WebContents* contents)
     : web_contents_(contents), save_form_data_(false) {
   JNIEnv* env = AttachCurrentThread();
   ScopedJavaLocalRef<jobject> delegate;
   delegate.Reset(
       Java_AwAutofillClient_create(env, reinterpret_cast<intptr_t>(this)));
 
   AwContents* aw_contents = AwContents::FromWebContents(web_contents_);
+  view_android_ = web_contents_->GetContentNativeView();

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

Sorry, I changed my mind after looking at the autofill popup call sites and
think you should call web_contents_->GetNativeView() here. (GetNativeView()
returns the container i.e. CVC ViewAndroid, GetContentNativeView() returns the
RWHVA's ViewAndroid which can change during navigation and what not.) And that
one should never be null, which is good.

nit: Also, no need to store it, but you can just call it below.

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

Done.

   aw_contents->SetAwAutofillClient(delegate.obj());
   java_ref_ = JavaObjectWeakGlobalRef(env, delegate.obj());
 }
 
 AwAutofillClient::~AwAutofillClient() {
   HideAutofillPopup();
 }
 
 void AwAutofillClient::SetSaveFormData(bool enabled) {
   save_form_data_ = enabled;
@@ skipping 67 matching lines @@
 
   for (size_t i = 0; i < count; ++i) {
     ScopedJavaLocalRef<jstring> name =
         ConvertUTF16ToJavaString(env, suggestions[i].value);
     ScopedJavaLocalRef<jstring> label =
         ConvertUTF16ToJavaString(env, suggestions[i].label);
     Java_AwAutofillClient_addToAutofillSuggestionArray(
         env, data_array.obj(), i, name.obj(), label.obj(),
         suggestions[i].frontend_id);
   }
-
+  if (!anchor_view_) {
+    anchor_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.

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

Done.

+  view_android_->SetAnchorRect(anchor_view_->ref(), element_bounds);
   Java_AwAutofillClient_showAutofillPopup(env,
                                           obj.obj(),
-                                          element_bounds.x(),
-                                          element_bounds.y(),
+                                          anchor_view_->obj(),
                                           element_bounds.width(),
-                                          element_bounds.height(),
                                           is_rtl,
                                           data_array.obj());
 }
 
 void AwAutofillClient::UpdateAutofillPopupDataListValues(
     const std::vector<base::string16>& values,
     const std::vector<base::string16>& labels) {
   // Leaving as an empty method since updating autofill popup window
   // dynamically does not seem to be a useful feature for android webview.
   // See crrev.com/18102002 if need to implement.
@@ skipping 42 matching lines @@
          !(ssl_status.content_status &
            content::SSLStatus::RAN_INSECURE_CONTENT);
 }
 
 bool AwAutofillClient::ShouldShowSigninPromo() {
   return false;
 }
 
 void AwAutofillClient::StartSigninFlow() {}
 
+void AwAutofillClient::Dismissed(JNIEnv* env,
+                                 const JavaParamRef<jobject>& obj) {
+  if (anchor_view_) {
+    anchor_view_.reset();
+  }
+}
+
 void AwAutofillClient::SuggestionSelected(JNIEnv* env,
                                           const JavaParamRef<jobject>& object,
                                           jint position) {
   if (delegate_) {
     delegate_->DidAcceptSuggestion(suggestions_[position].value,
                                    suggestions_[position].frontend_id,
                                    position);
   }
 }
 
@@ skipping 36 matching lines @@
 
 void AwAutofillClient::ScanCreditCard(const CreditCardScanCallback& callback) {
   NOTIMPLEMENTED();
 }
 
 bool RegisterAwAutofillClient(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace android_webview