Extract AutofillDialogController interface and common utilities.

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_controller.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 87 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) {
-#if defined(ENABLE_AUTOFILL_DIALOG)
   HideRequestAutocompleteDialog();
 
-  dialog_controller_ = AutofillDialogControllerImpl::Create(web_contents_,
-                                                            form,
-                                                            source_url,
-                                                            dialog_type,
-                                                            callback);
-  dialog_controller_->Show();
-#else
-  callback.Run(NULL, std::string());
-  NOTIMPLEMENTED();
-#endif  // #if !defined(ENABLE_AUTOFILL_DIALOG)
+  dialog_controller_ = AutofillDialogController::Create(web_contents_,
+                                                      form,

[aruslan, 2013/08/07 21:07:00]

Indent.

[aruslan, 2013/08/07 21:21:23]

Done.

+                                                      source_url,
+                                                      dialog_type,
+                                                      callback);
+  if (dialog_controller_) {
+    dialog_controller_->Show();
+  } else {
+    callback.Run(NULL, std::string());
+    NOTIMPLEMENTED();
+  }
 }
 
 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 56 matching lines @@
   if (!dialog_controller_.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_controller_->GetDialogType() == DIALOG_TYPE_REQUEST_AUTOCOMPLETE ||
       (!was_redirect && !preserve_dialog)) {
     HideRequestAutocompleteDialog();
   }
 }
 
 void TabAutofillManagerDelegate::WebContentsDestroyed(
     content::WebContents* web_contents) {
   HideAutofillPopup();
 }
 
 }  // namespace autofill