Enable Autocomplete feature for chromium webview

android_webview/native/aw_contents.cc

 // Copyright 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 "android_webview/native/aw_contents.h"
 
+#include "android_webview/browser/aw_autofill_external_delegate.h"
 #include "android_webview/browser/aw_browser_context.h"
 #include "android_webview/browser/aw_browser_main_parts.h"
 #include "android_webview/browser/browser_view_renderer_impl.h"
 #include "android_webview/browser/gpu_memory_buffer_impl.h"
 #include "android_webview/browser/net_disk_cache_remover.h"
 #include "android_webview/browser/renderer_host/aw_resource_dispatcher_host_delegate.h"
 #include "android_webview/common/aw_hit_test_data.h"
 #include "android_webview/native/aw_browser_dependency_factory.h"
 #include "android_webview/native/aw_contents_client_bridge.h"
 #include "android_webview/native/aw_contents_io_thread_client_impl.h"
 #include "android_webview/native/aw_web_contents_delegate.h"
 #include "android_webview/native/java_browser_view_renderer_helper.h"
 #include "android_webview/native/state_serializer.h"
 #include "android_webview/public/browser/draw_gl.h"
 #include "base/android/jni_android.h"
 #include "base/android/jni_array.h"
 #include "base/android/jni_string.h"
 #include "base/android/scoped_java_ref.h"
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/message_loop.h"
 #include "base/pickle.h"
 #include "base/string16.h"
 #include "base/supports_user_data.h"
-#include "components/autofill/browser/autofill_external_delegate.h"
 #include "components/autofill/browser/autofill_manager.h"
 #include "components/autofill/browser/webdata/autofill_webdata_service.h"
 #include "components/navigation_interception/intercept_navigation_delegate.h"
 #include "content/public/browser/android/content_view_core.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/cert_store.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/ssl_status.h"
 #include "jni/AwContents_jni.h"
 #include "net/cert/x509_certificate.h"
 #include "ui/base/l10n/l10n_util_android.h"
 #include "ui/gfx/android/java_bitmap.h"
 
 struct AwDrawSWFunctionTable;
 struct AwDrawGLFunctionTable;
 
-using autofill::AutofillExternalDelegate;
 using autofill::AutofillManager;
 using base::android::AttachCurrentThread;
 using base::android::ConvertJavaStringToUTF16;
 using base::android::ConvertJavaStringToUTF8;
 using base::android::ConvertUTF16ToJavaString;
 using base::android::ConvertUTF8ToJavaString;
 using base::android::JavaRef;
 using base::android::ScopedJavaGlobalRef;
 using base::android::ScopedJavaLocalRef;
 using components::InterceptNavigationDelegate;
@@ skipping 85 matching lines @@
   icon_helper_->SetListener(this);
   web_contents_->SetUserData(kAwContentsUserDataKey,
                              new AwContentsUserData(this));
   AwContentsClientBridgeBase::Associate(web_contents_.get(),
                                         contents_client_bridge_.get());
   web_contents_->SetDelegate(web_contents_delegate_.get());
   render_view_host_ext_.reset(
       new AwRenderViewHostExt(this, web_contents_.get()));
 
   AwAutofillManagerDelegate* autofill_manager_delegate =
-      AwBrowserContext::FromWebContents(web_contents_.get())->
-          AutofillManagerDelegate();
+      AwAutofillManagerDelegate::FromWebContents(web_contents_.get());
   if (autofill_manager_delegate)
     InitAutofillIfNecessary(autofill_manager_delegate->GetSaveFormData());
 }
 
 void AwContents::SetSaveFormData(bool enabled) {
   InitAutofillIfNecessary(enabled);
-  // We need to check for the existence, since autofill_manager_delegate
-  // may not be created when the setting is false.
-  if (AutofillManager::FromWebContents(web_contents_.get())) {
-    AwAutofillManagerDelegate* autofill_manager_delegate =
-        AwBrowserContext::FromWebContents(web_contents_.get())->
-            AutofillManagerDelegate();
-    autofill_manager_delegate->SetSaveFormData(enabled);
-  }
+  AwAutofillManagerDelegate::FromWebContents(web_contents_.get())->
+      SetSaveFormData(enabled);
 }
 
 void AwContents::InitAutofillIfNecessary(bool enabled) {
   // Do not initialize if the feature is not enabled.
   if (!enabled)
     return;
-  // Check if the autofill manager already exists.
+
   content::WebContents* web_contents = web_contents_.get();
   if (AutofillManager::FromWebContents(web_contents))
     return;
 
+  AwBrowserContext::FromWebContents(web_contents)->
+      CreateUserPrefServiceIfNecessary();
+
+  AwAutofillManagerDelegate::CreateForWebContents(web_contents);
+
   AutofillManager::CreateForWebContentsAndDelegate(
       web_contents,
-      AwBrowserContext::FromWebContents(web_contents)->
-          CreateAutofillManagerDelegate(enabled),
+      AwAutofillManagerDelegate::FromWebContents(web_contents),
       l10n_util::GetDefaultLocale(),
       AutofillManager::DISABLE_AUTOFILL_DOWNLOAD_MANAGER);
   AutofillManager* autofill_manager =
       AutofillManager::FromWebContents(web_contents);
-  AutofillExternalDelegate::CreateForWebContentsAndManager(
+  AwAutofillExternalDelegate::CreateForWebContentsAndManager(

[benm (inactive), 2013/05/23 12:02:21]

nit: move this consctruction into the setter below?

[sgurun-gerrit only, 2013/05/23 17:10:01]

not sure if I understand right (I did not have a morning coffee yet)
autofill_manager->SetExternalDelegate(
AwAutofillExternalDelegate::CreateForWebContentsAndManager(
      web_contents,
      autofill_manager));
but createforwebcontentsbla is a void function.

       web_contents,
       autofill_manager);
   autofill_manager->SetExternalDelegate(
-      AutofillExternalDelegate::FromWebContents(web_contents));
+      AwAutofillExternalDelegate::FromWebContents(web_contents));
 }
 
 void AwContents::SetWebContents(JNIEnv* env, jobject obj, jint new_wc) {
   SetWebContents(reinterpret_cast<content::WebContents*>(new_wc));
 }
 
 AwContents::~AwContents() {
   DCHECK(AwContents::FromWebContents(web_contents_.get()) == this);
   web_contents_->RemoveUserData(kAwContentsUserDataKey);
   if (find_helper_.get())
@@ skipping 499 matching lines @@
   return browser_view_renderer_->CapturePicture();
 }
 
 void AwContents::EnableOnNewPicture(JNIEnv* env,
                                     jobject obj,
                                     jboolean enabled) {
   browser_view_renderer_->EnableOnNewPicture(enabled);
 }
 
 }  // namespace android_webview