[rAc] Move email address into billing address section.

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>
 
@@ skipping 268 matching lines @@
   // Shows a new credit card saved bubble and passes ownership of |new_card| and
   // |billing_profile| to the bubble. Exposed for testing.
   virtual void ShowNewCreditCardBubble(
       scoped_ptr<CreditCard> new_card,
       scoped_ptr<AutofillProfile> billing_profile);
 
  private:
   // Whether or not the current request wants credit info back.
   bool RequestingCreditCardInfo() const;
 
-  // Initializes or updates |suggested_email_| et al.
+  // Initializes or updates |suggested_cc_| et al.
   void SuggestionsUpdated();
 
   // Whether the user's wallet items have at least one address and instrument.
   bool HasCompleteWallet() const;
 
   // Starts fetching the wallet items from Online Wallet.
   void GetWalletItems();
 
   // Stop showing sign in flow.
   void HideSignIn();
@@ skipping 56 matching lines @@
   void FillOutputForSection(DialogSection section);
   // As above, but uses |compare| to determine whether a DetailInput matches
   // a field. Saves any new Autofill data to the PersonalDataManager.
   void FillOutputForSectionWithComparator(DialogSection section,
                                           const InputFieldComparator& compare);
 
   // Returns whether |form_structure|_| has any fields that match the fieldset
   // represented by |section|.
   bool FormStructureCaresAboutSection(DialogSection section) const;
 
-  // Sets the CVC result on |form_structure_| to the value in |cvc|.
-  void SetCvcResult(const string16& cvc);
+  // Finds all fields of the given |type| in |form_structure_|, if any, and sets
+  // each field's value to |output|.
+  void SetOutputForFieldsOfType(ServerFieldType type, const string16& output);
 
   // Gets the value for |type| in |section|, whether it comes from manual user
   // input or the active suggestion.
   string16 GetValueFromSection(DialogSection section,
                                ServerFieldType type);
 
   // Saves the data in |profile| to the personal data manager. This may add
   // a new profile or tack onto an existing profile.
   void SaveProfileGleanedFromSection(const AutofillProfile& profile,
                                      DialogSection section);
 
   // Gets the SuggestionsMenuModel for |section|.
   SuggestionsMenuModel* SuggestionsMenuModelForSection(DialogSection section);
   const SuggestionsMenuModel* SuggestionsMenuModelForSection(
       DialogSection section) const;
   // And the reverse.
   DialogSection SectionForSuggestionsMenuModel(
       const SuggestionsMenuModel& model);
 
   // Suggested text and icons for sections. Suggestion text is used to show an
-  // abidged overview of the currently used suggestion. Extra text is used when
+  // abridged overview of the currently used suggestion. Extra text is used when
   // part of a section is suggested but part must be manually input (e.g. during
   // a CVC challenge or when using Autofill's CC section [never stores CVC]).
   bool SuggestionTextForSection(DialogSection section,
                                 base::string16* vertically_compact,
                                 base::string16* horizontally_compact);
   string16 RequiredActionTextForSection(DialogSection section) const;
   gfx::Image SuggestionIconForSection(DialogSection section);
   string16 ExtraSuggestionTextForSection(DialogSection section) const;
   gfx::Image ExtraSuggestionIconForSection(DialogSection section) const;
 
@@ skipping 188 matching lines @@
   string16 legal_documents_text_;
   // The ranges within |legal_documents_text_| to linkify.
   std::vector<ui::Range> legal_document_link_ranges_;
 
   // The instrument and address IDs from the Online Wallet server to be used
   // when getting a full wallet.
   std::string active_instrument_id_;
   std::string active_address_id_;
 
   // The fields for billing and shipping which the page has actually requested.
-  DetailInputs requested_email_fields_;
   DetailInputs requested_cc_fields_;
   DetailInputs requested_billing_fields_;
   DetailInputs requested_cc_billing_fields_;
   DetailInputs requested_shipping_fields_;
 
   // Models for the credit card expiration inputs.
   MonthComboboxModel cc_exp_month_combobox_model_;
   YearComboboxModel cc_exp_year_combobox_model_;
 
   // Model for the country input.
   CountryComboboxModel country_combobox_model_;
 
   // Models for the suggestion views.
-  SuggestionsMenuModel suggested_email_;
   SuggestionsMenuModel suggested_cc_;
   SuggestionsMenuModel suggested_billing_;
   SuggestionsMenuModel suggested_cc_billing_;
   SuggestionsMenuModel suggested_shipping_;
 
   // |DialogSection|s that are in edit mode that are based on existing data.
   std::set<DialogSection> section_editing_state_;
 
   // Whether |form_structure_| has asked for any details that would indicate
   // we should show a shipping section.
@@ skipping 62 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_