[WIP] Split AutofillDialogControllerImpl + integrate rAc on Android.

chrome/browser/ui/autofill/tab_autofill_manager_delegate.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/autofill/tab_autofill_manager_delegate.h"
 
 #include "base/logging.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/autofill/autocheckout_whitelist_manager_factory.h"
 #include "chrome/browser/autofill/autofill_cc_infobar_delegate.h"
 #include "chrome/browser/autofill/personal_data_manager_factory.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/autofill/autocheckout_bubble.h"
 #include "chrome/browser/ui/autofill/autocheckout_bubble_controller.h"
-#include "chrome/browser/ui/autofill/autofill_dialog_controller_impl.h"
+#include "chrome/browser/ui/autofill/autofill_dialog_tab_manager_delegate.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/chrome_pages.h"
 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
 #include "chrome/common/url_constants.h"
 #include "components/autofill/content/browser/autofill_driver_impl.h"
 #include "components/autofill/core/common/autofill_pref_names.h"
 #include "content/public/browser/navigation_details.h"
@@ skipping 17 matching lines @@
   // requires that the WebContents instance still be valid and it is not at
   // this point (in particular, the WebContentsImpl destructor has already
   // finished running and we are now in the base class destructor).
   DCHECK(!popup_controller_);
 }
 
 void TabAutofillManagerDelegate::TabActivated(int reason) {
   if (reason != TabStripModelObserver::CHANGE_REASON_USER_GESTURE)
     return;
 
-  if (dialog_controller_.get())
-    dialog_controller_->TabActivated();
+  if (dialog_delegate_.get())
+    dialog_delegate_->TabActivated();
 }
 
 PersonalDataManager* TabAutofillManagerDelegate::GetPersonalDataManager() {
   Profile* profile =
       Profile::FromBrowserContext(web_contents_->GetBrowserContext());
   return PersonalDataManagerFactory::GetForProfile(
       profile->GetOriginalProfile());
 }
 
 PrefService* TabAutofillManagerDelegate::GetPrefs() {
   return Profile::FromBrowserContext(web_contents_->GetBrowserContext())->
       GetPrefs();
 }
 
 autocheckout::WhitelistManager*
 TabAutofillManagerDelegate::GetAutocheckoutWhitelistManager() const {
   Profile* profile =
       Profile::FromBrowserContext(web_contents_->GetBrowserContext());
   return autocheckout::WhitelistManagerFactory::GetForProfile(
       profile->GetOriginalProfile());
 }
 
 void TabAutofillManagerDelegate::OnAutocheckoutError() {
-  // |dialog_controller_| is a WeakPtr, but we require it to be present when
+  // |dialog_delegate_| is a WeakPtr, but we require it to be present when
   // |OnAutocheckoutError| is called, so we intentionally do not do NULL check.
-  dialog_controller_->OnAutocheckoutError();
+  dialog_delegate_->OnAutocheckoutError();
 }
 
 void TabAutofillManagerDelegate::OnAutocheckoutSuccess() {
-  dialog_controller_->OnAutocheckoutSuccess();
+  dialog_delegate_->OnAutocheckoutSuccess();
 }
 
 void TabAutofillManagerDelegate::ShowAutofillSettings() {
 #if defined(OS_ANDROID)
   NOTIMPLEMENTED();
 #else
   Browser* browser = chrome::FindBrowserWithWebContents(web_contents_);
   if (browser)
     chrome::ShowSettingsSubPage(browser, chrome::kAutofillSubPage);
 #endif  // #if defined(OS_ANDROID)
@@ skipping 18 matching lines @@
   NOTIMPLEMENTED();
 #else
   HideAutocheckoutBubble();
 
   // Convert |bounding_box| to be in screen space.
   gfx::Rect container_rect;
   web_contents_->GetView()->GetContainerBounds(&container_rect);
   gfx::RectF anchor = bounding_box + container_rect.OffsetFromOrigin();
 
   autocheckout_bubble_ =
-      AutocheckoutBubble::Create(scoped_ptr<AutocheckoutBubbleController>(
-          new AutocheckoutBubbleController(
-              anchor,
-              web_contents_->GetView()->GetTopLevelNativeWindow(),
-              is_google_user,
-              callback)));
+      AutocheckoutBubble::Create(
+          web_contents_,
+          scoped_ptr<AutocheckoutBubbleController>(
+              new AutocheckoutBubbleController(
+                  anchor,
+                  web_contents_->GetView()->GetTopLevelNativeWindow(),
+                  is_google_user,
+                  callback)));
   autocheckout_bubble_->ShowBubble();
 #endif  // #if !defined(TOOLKIT_VIEWS)
 }
 
 void TabAutofillManagerDelegate::HideAutocheckoutBubble() {
   if (autocheckout_bubble_.get())
     autocheckout_bubble_->HideBubble();
 }
 
 void TabAutofillManagerDelegate::ShowRequestAutocompleteDialog(
     const FormData& form,
     const GURL& source_url,
     DialogType dialog_type,
     const base::Callback<void(const FormStructure*,
                               const std::string&)>& callback) {
   HideRequestAutocompleteDialog();
 
-  dialog_controller_ = AutofillDialogControllerImpl::Create(web_contents_,
-                                                            form,
-                                                            source_url,
-                                                            dialog_type,
-                                                            callback);
-  dialog_controller_->Show();
+#if defined(ENABLE_AUTOFILL_DIALOG)

[Evan Stade, 2013/08/01 19:44:52]

I don't think you need this ifdef. Instead do

if (dialog_delegate_)
  dialog_delegate_->Show();
else
  NOTIMPL()
  callback()

[aruslan, 2013/08/07 23:17:03]

Done.

+  dialog_delegate_ = AutofillDialogTabManagerDelegate::Create(web_contents_,
+                                                              form,
+                                                              source_url,
+                                                              dialog_type,
+                                                              callback);
+  dialog_delegate_->Show();
+#else
+  callback.Run(NULL, std::string());
+  NOTIMPLEMENTED();
+#endif  // #if !defined(ENABLE_AUTOFILL_DIALOG)
 }
 
 void TabAutofillManagerDelegate::ShowAutofillPopup(
     const gfx::RectF& element_bounds,
     base::i18n::TextDirection text_direction,
     const std::vector<string16>& values,
     const std::vector<string16>& labels,
     const std::vector<string16>& icons,
     const std::vector<int>& identifiers,
     base::WeakPtr<AutofillPopupDelegate> delegate) {
@@ skipping 21 matching lines @@
     popup_controller_->UpdateDataListValues(values, labels);
 }
 
 void TabAutofillManagerDelegate::HideAutofillPopup() {
   if (popup_controller_.get())
     popup_controller_->Hide();
 }
 
 void TabAutofillManagerDelegate::AddAutocheckoutStep(
     AutocheckoutStepType step_type) {
-  dialog_controller_->AddAutocheckoutStep(step_type);
+  dialog_delegate_->AddAutocheckoutStep(step_type);
 }
 
 void TabAutofillManagerDelegate::UpdateAutocheckoutStep(
     AutocheckoutStepType step_type,
     AutocheckoutStepStatus step_status) {
-  dialog_controller_->UpdateAutocheckoutStep(step_type, step_status);
+  dialog_delegate_->UpdateAutocheckoutStep(step_type, step_status);
 }
 
 bool TabAutofillManagerDelegate::IsAutocompleteEnabled() {
   // For browser, Autocomplete is always enabled as part of Autofill.
   return GetPrefs()->GetBoolean(prefs::kAutofillEnabled);
 }
 
 void TabAutofillManagerDelegate::HideRequestAutocompleteDialog() {
-  if (dialog_controller_.get())
-    dialog_controller_->Hide();
+  if (dialog_delegate_.get())
+    dialog_delegate_->Hide();
 }
 
 void TabAutofillManagerDelegate::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
 
   HideAutocheckoutBubble();
 
-  if (!dialog_controller_.get())
+  if (!dialog_delegate_.get())
     return;
 
   // A redirect immediately after a successful Autocheckout flow shouldn't hide
   // the dialog.
   bool preserve_dialog = AutofillDriverImpl::FromWebContents(web_contents())->
       autofill_manager()->autocheckout_manager()->should_preserve_dialog();
   bool was_redirect = details.entry &&
       content::PageTransitionIsRedirect(details.entry->GetTransitionType());
 
-  if (dialog_controller_->dialog_type() == DIALOG_TYPE_REQUEST_AUTOCOMPLETE ||
+  if (dialog_delegate_->GetDialogType() == DIALOG_TYPE_REQUEST_AUTOCOMPLETE ||
       (!was_redirect && !preserve_dialog)) {
     HideRequestAutocompleteDialog();
   }
 }
 
 void TabAutofillManagerDelegate::WebContentsDestroyed(
     content::WebContents* web_contents) {
   HideAutofillPopup();
 }
 
 }  // namespace autofill