Tentatively revert 180083

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 <vector>
 
 #include "base/callback.h"
@@ skipping 51 matching lines @@
   virtual string16 DialogTitle() const OVERRIDE;
   virtual string16 EditSuggestionText() const OVERRIDE;
   virtual string16 UseBillingForShippingText() const OVERRIDE;
   virtual string16 WalletOptionText() const OVERRIDE;
   virtual string16 CancelButtonText() const OVERRIDE;
   virtual string16 ConfirmButtonText() const OVERRIDE;
   virtual string16 SignInText() const OVERRIDE;
   virtual string16 SaveLocallyText() const OVERRIDE;
   virtual string16 CancelSignInText() const OVERRIDE;
   virtual string16 ProgressBarText() const OVERRIDE;
-  virtual DialogSignedInState SignedInState() const OVERRIDE;
   virtual const DetailInputs& RequestedFieldsForSection(DialogSection section)
       const OVERRIDE;
   virtual ui::ComboboxModel* ComboboxModelForAutofillType(
       AutofillFieldType type) OVERRIDE;
   virtual ui::MenuModel* MenuModelForSection(DialogSection section) OVERRIDE;
   virtual string16 LabelForSection(DialogSection section) const OVERRIDE;
   virtual string16 SuggestionTextForSection(DialogSection section) OVERRIDE;
   virtual gfx::Image SuggestionIconForSection(DialogSection section) OVERRIDE;
   virtual void EditClickedForSection(DialogSection section) OVERRIDE;
   virtual bool InputIsValid(const DetailInput* input, const string16& value)
@@ skipping 61 matching lines @@
   typedef base::Callback<bool(const DetailInput& input,
                               const AutofillField& field)> InputFieldComparator;
 
   // Whether or not the current request wants credit info back.
   bool RequestingCreditCardInfo() const;
 
   // Whether the information input in this dialog will be securely transmitted
   // to the requesting site.
   bool TransmissionWillBeSecure() const;
 
-  // Convenience method to tell whether we need to address |action|.
-  bool HasRequiredAction(wallet::RequiredAction action) const;
-
   // Initializes |suggested_email_| et al.
   void GenerateSuggestionsModels();
 
   // Returns whether |profile| is complete, i.e. can fill out all the relevant
   // address info. Incomplete profiles will not be displayed in the dropdown
   // menu.
   bool IsCompleteProfile(const AutofillProfile& profile);
 
   // Fills in |section|-related fields in |output_| according to the state of
   // |view_|.
@@ skipping 27 matching lines @@
       std::vector<string16>* popup_values,
       std::vector<string16>* popup_labels,
       std::vector<string16>* popup_icons);
 
   // Returns the PersonalDataManager for |profile_|.
   PersonalDataManager* GetManager();
 
   // Like RequestedFieldsForSection, but returns a pointer.
   DetailInputs* MutableRequestedFieldsForSection(DialogSection section);
 
+  // Turns a required action into a notification.
+  DialogNotification RequiredActionNotification(
+      const std::vector<wallet::RequiredAction>& required_actions) const;
+
   // Hides |popup_controller_|'s popup view, if it exists.
   void HidePopup();
 
   // The |profile| for |contents_|.
   Profile* const profile_;
 
   // The WebContents where the Autofill action originated.
   content::WebContents* const contents_;
 
   FormStructure form_structure_;
@@ skipping 52 matching lines @@
 
   // A NotificationRegistrar for tracking the completion of sign-in.
   content::NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogControllerImpl);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_IMPL_H_