requestAutocomplete: change comboboxes to dropdown menus

chrome/browser/ui/views/autofill/autofill_dialog_views.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_VIEWS_AUTOFILL_AUTOFILL_DIALOG_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_AUTOFILL_AUTOFILL_DIALOG_VIEWS_H_
 
 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_view.h"
 #include "ui/views/controls/button/button.h"
-#include "ui/views/controls/combobox/combobox_listener.h"
+#include "ui/views/controls/button/menu_button_listener.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/focus/focus_manager.h"
 #include "ui/views/window/dialog_delegate.h"
 
 class ConstrainedWindowViews;
 
 namespace views {
 class Checkbox;
+class Combobox;
+class Label;
+class MenuButton;
+class MenuRunner;
 class Textfield;
 }
 
 namespace ui {
 class ComboboxModel;
 class KeyEvent;
 }
 
 namespace autofill {
 
 struct DetailInput;
 
 // Views toolkit implementation of the Autofill dialog that handles the
 // imperative autocomplete API call.
 class AutofillDialogViews : public AutofillDialogView,
                             public views::DialogDelegate,
                             public views::ButtonListener,
-                            public views::ComboboxListener,
+                            public views::MenuButtonListener,
                             public views::TextfieldController,
                             public views::FocusChangeListener {
  public:
   explicit AutofillDialogViews(AutofillDialogController* controller);
   virtual ~AutofillDialogViews();
 
   // AutofillDialogView implementation:
   virtual void Show() OVERRIDE;
   virtual void UpdateSection(DialogSection section) OVERRIDE;
-  virtual int GetSuggestionSelection(DialogSection section) OVERRIDE;
   virtual void GetUserInput(DialogSection section,
                             DetailOutputMap* output) OVERRIDE;
   virtual bool UseBillingForShipping() OVERRIDE;
 
   // views::DialogDelegate implementation:
   virtual string16 GetWindowTitle() const OVERRIDE;
   virtual void WindowClosing() OVERRIDE;
   virtual void DeleteDelegate() OVERRIDE;
   virtual views::Widget* GetWidget() OVERRIDE;
   virtual const views::Widget* GetWidget() const OVERRIDE;
   virtual views::View* GetContentsView() OVERRIDE;
   virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
   virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
 
   // views::ButtonListener implementation:
   virtual void ButtonPressed(views::Button* sender,
                              const ui::Event& event) OVERRIDE;
 
-  // views::ComboboxListener implementation:
-  virtual void OnSelectedIndexChanged(views::Combobox* combobox) OVERRIDE;
+  // views::MenuButtonListener implementation:
+  virtual void OnMenuButtonClicked(views::View* source,
+                                   const gfx::Point& point) OVERRIDE;
 
   // views::TextfieldController implementation:
   virtual void ContentsChanged(views::Textfield* sender,
                                const string16& new_contents) OVERRIDE;
   virtual bool HandleKeyEvent(views::Textfield* sender,
                               const ui::KeyEvent& key_event) OVERRIDE;
 
   // views::FocusChangeListener implementation.
   virtual void OnWillChangeFocus(views::View* focused_before,
                                  views::View* focused_now) OVERRIDE;
   virtual void OnDidChangeFocus(views::View* focused_before,
                                 views::View* focused_now) OVERRIDE;
 
  private:
   typedef std::map<const DetailInput*, views::Textfield*> TextfieldMap;
   typedef std::map<const DetailInput*, views::Combobox*> ComboboxMap;
 
   // A convenience struct for holding pointers to views within each detail
   // section. None of the member pointers are owned.
   struct DetailsGroup {
-    DetailsGroup();
+    explicit DetailsGroup(DialogSection section);
     ~DetailsGroup();
 
+    // The section this group is associated with.
+    const DialogSection section;
     // The view that contains the entire section (label + input).
     views::View* container;
-    // The combobox that holds suggested values.
-    views::Combobox* suggested_input;
     // The view that allows manual input.
     views::View* manual_input;
     // The textfields in |manual_input|, tracked by their DetailInput.
     TextfieldMap textfields;
     // The comboboxes in |manual_input|, tracked by their DetailInput.
     ComboboxMap comboboxes;
+    // The label that holds the text of the suggested data. This will be
+    // visible IFF |manual_input| is not visible.
+    views::Label* suggested_info;
+    // The view that allows selecting other data suggestions.
+    views::MenuButton* suggested_button;
   };
 
   void InitChildViews();
 
   // Creates and returns a view that holds all detail sections.
   views::View* CreateDetailsContainer();
 
   // Creates and returns a view that holds the requesting host and intro text.
   views::View* CreateIntroContainer();
 
@@ skipping 38 matching lines @@
   // The credit card and billing sections are combined, so cc_.container is
   // not used.
   DetailsGroup cc_;
   DetailsGroup billing_;
   DetailsGroup shipping_;
 
   // The checkbox that controls whether to use the billing details for shipping
   // as well.
   views::Checkbox* use_billing_for_shipping_;
 
+  // Runs the suggestion menu (triggered by each section's |suggested_button|.
+  scoped_ptr<views::MenuRunner> menu_runner_;
+
   DISALLOW_COPY_AND_ASSIGN(AutofillDialogViews);
 };
 
 }  // namespace autofill
 
 #endif  // CHROME_BROWSER_UI_VIEWS_AUTOFILL_AUTOFILL_DIALOG_VIEWS_H_