Extract AutofillDialogController interface and common utilities.

chrome/browser/ui/autofill/autofill_dialog_controller_impl.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_
 
 #include <set>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "chrome/browser/ui/autofill/account_chooser_model.h"
+#include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_types.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view_delegate.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/browser/ui/autofill/country_combobox_model.h"
 #include "components/autofill/content/browser/autocheckout_steps.h"
 #include "components/autofill/content/browser/wallet/wallet_client.h"
 #include "components/autofill/content/browser/wallet/wallet_client_delegate.h"
 #include "components/autofill/content/browser/wallet/wallet_items.h"
 #include "components/autofill/content/browser/wallet/wallet_signin_helper_delegate.h"
@@ skipping 33 matching lines @@
 class Fingerprint;
 }
 
 namespace wallet {
 class WalletSigninHelper;
 }
 
 // This class drives the dialog that appears when a site uses the imperative
 // autocomplete API to fill out a form.
 class AutofillDialogControllerImpl : public AutofillDialogViewDelegate,
+                                     public AutofillDialogController,
                                      public AutofillPopupDelegate,
                                      public content::NotificationObserver,
                                      public SuggestionsMenuModelDelegate,
                                      public wallet::WalletClientDelegate,
                                      public wallet::WalletSigninHelperDelegate,
                                      public PersonalDataManagerObserver,
                                      public AccountChooserModelDelegate {
  public:
   virtual ~AutofillDialogControllerImpl();
 
-  static base::WeakPtr<AutofillDialogControllerImpl> Create(
+  static base::WeakPtr<AutofillDialogController> Create(
       content::WebContents* contents,
       const FormData& form_structure,
       const GURL& source_url,
       const DialogType dialog_type,
       const base::Callback<void(const FormStructure*,
                                 const std::string&)>& callback);
 
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
-  void Show();
-  void Hide();
+  virtual void Show() OVERRIDE;
+  virtual void Hide() OVERRIDE;
 
   // Called when the tab hosting this dialog is activated by a user gesture.

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

Remove descriptions, condense the overrides.
Add "// AutofillDialogController implementation." and reorder functions to match
the order in AutofillDialogController if necessary.

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

Done.

   // Used to trigger a refresh of the user's Wallet data.
-  void TabActivated();
+  virtual void TabActivated() OVERRIDE;
 
   // Adds a step in the flow to the Autocheckout UI.
-  void AddAutocheckoutStep(AutocheckoutStepType step_type);
+  virtual void AddAutocheckoutStep(AutocheckoutStepType step_type) OVERRIDE;
 
   // Updates the status of a step in the Autocheckout UI.
-  void UpdateAutocheckoutStep(AutocheckoutStepType step_type,
-                              AutocheckoutStepStatus step_status);
+  virtual void UpdateAutocheckoutStep(
+      AutocheckoutStepType step_type,
+      AutocheckoutStepStatus step_status) OVERRIDE;
 
   // Called when there is an error in an active Autocheckout flow.
-  void OnAutocheckoutError();
+  virtual void OnAutocheckoutError() OVERRIDE;
 
   // Called when an Autocheckout flow completes successfully.
-  void OnAutocheckoutSuccess();
+  virtual void OnAutocheckoutSuccess() OVERRIDE;
 
   // Returns |view_| as a testable version of itself (if |view_| exists and
   // actually implements |AutofillDialogView::GetTestableView()|).
   TestableAutofillDialogView* GetTestableView();
 
   // AutofillDialogViewDelegate implementation.
   virtual string16 DialogTitle() const OVERRIDE;
   virtual string16 AccountChooserText() const OVERRIDE;
   virtual string16 SignInLinkText() const OVERRIDE;
   virtual string16 EditSuggestionText() const OVERRIDE;
@@ skipping 594 matching lines @@
   // show a bubble as the dialog closes to confirm a user's new card info was
   // saved. Never populated while incognito (as nothing's actually saved).
   scoped_ptr<CreditCard> newly_saved_card_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogControllerImpl);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_