requestAutocomplete: change comboboxes to dropdown menus

chrome/browser/ui/autofill/autofill_dialog_controller.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_H_
 #define CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_H_
 
 #include <map>
 #include <set>
 #include <utility>
 #include <vector>
 
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/string16.h"
 #include "chrome/browser/autofill/field_types.h"
 #include "chrome/browser/autofill/form_structure.h"
 #include "chrome/browser/autofill/personal_data_manager.h"
-#include "chrome/browser/ui/autofill/autofill_dialog_comboboxes.h"
+#include "chrome/browser/ui/autofill/autofill_dialog_models.h"
 #include "chrome/browser/ui/autofill/autofill_popup_controller_impl.h"
 #include "chrome/browser/ui/autofill/autofill_popup_delegate.h"
 #include "content/public/common/ssl_status.h"
 #include "ui/base/models/combobox_model.h"
+#include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/native_widget_types.h"
 
 class AutofillPopupControllerImpl;
 class FormGroup;
 class GURL;
 class Profile;
 
 namespace content {
 class WebContents;
 }
@@ skipping 39 matching lines @@
 enum DialogAction {
   ACTION_ABORT,
   ACTION_SUBMIT,
 };
 
 typedef std::vector<DetailInput> DetailInputs;
 typedef std::map<const DetailInput*, string16> DetailOutputMap;
 
 // This class drives the dialog that appears when a site uses the imperative
 // autocomplete API to fill out a form.
-class AutofillDialogController : public AutofillPopupDelegate {
+class AutofillDialogController : public AutofillPopupDelegate,
+                                 public SuggestionsMenuModelDelegate {
  public:
   AutofillDialogController(
       content::WebContents* contents,
       const FormData& form_structure,
       const GURL& source_url,
       const content::SSLStatus& ssl_status,
       const base::Callback<void(const FormStructure*)>& callback);
   virtual ~AutofillDialogController();
 
   void Show();
 
   // Called by the view.
   string16 DialogTitle() const;
   string16 SecurityWarning() const;
   string16 SiteLabel() const;
   string16 IntroText() const;
   // Returns the text before and after |SiteLabel()| in |IntroText()|. This is
   // needed because views need to bold just part of a translation.
   std::pair<string16, string16> GetIntroTextParts() const;
   string16 LabelForSection(DialogSection section) const;
   string16 UseBillingForShippingText() const;
   string16 WalletOptionText() const;
   string16 CancelButtonText() const;
   string16 ConfirmButtonText() const;
   bool ConfirmButtonEnabled() const;
   // Returns the set of inputs the page has requested which fall under
   // |section|.
   const DetailInputs& RequestedFieldsForSection(DialogSection section) const;
+  // Returns the combobox model for inputs of type |type|, or NULL if the input
+  // should be a text field.
   ui::ComboboxModel* ComboboxModelForAutofillType(AutofillFieldType type);
   // Returns the model for suggestions for fields that fall under |section|.
-  ui::ComboboxModel* ComboboxModelForSection(DialogSection section);
+  ui::MenuModel* MenuModelForSection(DialogSection section);
+  string16 SuggestionTextForSection(DialogSection section);
 
   // Called when the view has been closed. The value for |action| indicates
   // whether the Autofill operation should be aborted.
   void ViewClosed(DialogAction action);
 
   // Called by the view when the user changes the contents of a text field.
   void UserEditedInput(const DetailInput* input,
                        gfx::NativeView view,
                        const gfx::Rect& content_bounds,
                        const string16& field_contents);
 
   // Called when focus has changed position within the view.
   void FocusMoved();
 
   // AutofillPopupDelegate implementation.
   virtual void DidSelectSuggestion(int identifier) OVERRIDE;
   virtual void DidAcceptSuggestion(const string16& value,
                                    int identifier) OVERRIDE;
   virtual void RemoveSuggestion(const string16& value,
                                 int identifier) OVERRIDE;
   virtual void ClearPreviewedForm() OVERRIDE;
   virtual void ControllerDestroyed() OVERRIDE;
 
+  // SuggestionsMenuModelDelegate implementation.
+  virtual void SuggestionItemSelected(const SuggestionsMenuModel& model)
+      OVERRIDE;
+
   content::WebContents* web_contents() { return contents_; }
 
  private:
   // Determines whether |input| and |field| match.
   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 or not the view should show a security warning.
   bool ShouldShowSecurityWarning() const;
 
   // Initializes |suggested_email_| et al.
-  void GenerateComboboxModels();
+  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_|.
   void FillOutputForSection(DialogSection section);
   // As above, but uses |compare| to determine whether a DetailInput matches
   // a field.
   void FillOutputForSectionWithComparator(DialogSection section,
                                           const InputFieldComparator& compare);
 
   // Fills in |form_structure_| using |form_group|. Utility method for
   // FillOutputForSection.
   void FillFormStructureForSection(const FormGroup& form_group,
                                    DialogSection section,
                                    const InputFieldComparator& compare);
 
-  // Gets the SuggestionsComboboxModel for |section|.
-  SuggestionsComboboxModel* SuggestionsModelForSection(DialogSection section);
+  // Gets the SuggestionsMenuModel for |section|.
+  SuggestionsMenuModel* SuggestionsMenuModelForSection(DialogSection section);
+  // And the reverse.
+  DialogSection SectionForSuggestionsMenuModel(
+      const SuggestionsMenuModel& model);
 
   // Loads profiles that can suggest data for |type|. |field_contents| is the
   // part the user has already typed. |inputs| is the rest of section.
   // Identifying info is loaded into the last three outparams as well as
   // |popup_guids_|.
   void GetProfileSuggestions(
       AutofillFieldType type,
       const string16& field_contents,
       const DetailInputs& inputs,
       std::vector<string16>* popup_values,
@@ skipping 23 matching lines @@
   DetailInputs requested_email_fields_;
   DetailInputs requested_cc_fields_;
   DetailInputs requested_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_;
 
   // Models for the suggestion views.
-  SuggestionsComboboxModel suggested_email_;
-  SuggestionsComboboxModel suggested_cc_;
-  SuggestionsComboboxModel suggested_billing_;
-  SuggestionsComboboxModel suggested_shipping_;
+  SuggestionsMenuModel suggested_email_;
+  SuggestionsMenuModel suggested_cc_;
+  SuggestionsMenuModel suggested_billing_;
+  SuggestionsMenuModel suggested_shipping_;
 
   // The GUIDs for the currently showing unverified profiles popup.
   std::vector<PersonalDataManager::GUIDPair> popup_guids_;
 
   AutofillPopupControllerImpl* popup_controller_;
 
   scoped_ptr<AutofillDialogView> view_;
 
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogController);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_AUTOFILL_AUTOFILL_DIALOG_CONTROLLER_H_