requestAutocomplete: change comboboxes to dropdown menus

chrome/browser/ui/views/autofill/autofill_dialog_views.cc

 // 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.
 
 #include "chrome/browser/ui/views/autofill/autofill_dialog_views.h"
 
 #include <utility>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
 #include "chrome/browser/ui/views/constrained_window_views.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/views/border.h"
 #include "ui/views/controls/button/checkbox.h"
+#include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/label.h"
+#include "ui/views/controls/menu/menu_model_adapter.h"
+#include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/box_layout.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/layout/layout_constants.h"
 
 namespace autofill {
 
 namespace {
 
@@ skipping 45 matching lines @@
 // static
 AutofillDialogView* AutofillDialogView::Create(
     AutofillDialogController* controller) {
   return new AutofillDialogViews(controller);
 }
 
 AutofillDialogViews::AutofillDialogViews(AutofillDialogController* controller)
     : controller_(controller),
       did_submit_(false),
       window_(NULL),
-      contents_(NULL) {
+      contents_(NULL),
+      email_(SECTION_EMAIL),
+      cc_(SECTION_CC),
+      billing_(SECTION_BILLING),
+      shipping_(SECTION_SHIPPING) {
   DCHECK(controller);
 }
 
 AutofillDialogViews::~AutofillDialogViews() {
   DCHECK(!window_);
 }
 
 void AutofillDialogViews::Show() {
   InitChildViews();
 
@@ skipping 10 matching lines @@
   DetailsGroup* group = GroupForSection(section);
 
   for (DetailInputs::const_iterator iter = updated_inputs.begin();
        iter != updated_inputs.end(); ++iter) {
     TextfieldMap::iterator input = group->textfields.find(&(*iter));
     if (input == group->textfields.end())
       continue;
 
     input->second->SetText(iter->autofilled_value);
   }
-}
 
-int AutofillDialogViews::GetSuggestionSelection(DialogSection section) {
-  return GroupForSection(section)->suggested_input->selected_index();
+  UpdateDetailsGroupState(*group);
 }
 
 void AutofillDialogViews::GetUserInput(DialogSection section,
                                        DetailOutputMap* output) {
   DetailsGroup* group = GroupForSection(section);
   for (TextfieldMap::iterator it = group->textfields.begin();
        it != group->textfields.end(); ++it) {
     output->insert(std::make_pair(it->first, it->second->text()));
   }
-  for (ComboboxMap::iterator it = group->comboboxes.begin();
-       it != group->comboboxes.end(); ++it) {
-    views::Combobox* combobox = it->second;
-    output->insert(std::make_pair(
-        it->first,
-        combobox->model()->GetItemAt(combobox->selected_index())));
-  }
 }
 
 bool AutofillDialogViews::UseBillingForShipping() {
   return use_billing_for_shipping_->checked();
 }
 
 string16 AutofillDialogViews::GetWindowTitle() const {
   return controller_->DialogTitle();
 }
 
@@ skipping 39 matching lines @@
   return true;
 }
 
 void AutofillDialogViews::ButtonPressed(views::Button* sender,
                                         const ui::Event& event) {
   DCHECK_EQ(sender, use_billing_for_shipping_);
   shipping_.container->SetVisible(!use_billing_for_shipping_->checked());
   GetWidget()->SetSize(GetWidget()->non_client_view()->GetPreferredSize());
 }
 
-void AutofillDialogViews::OnSelectedIndexChanged(views::Combobox* combobox) {
+void AutofillDialogViews::OnMenuButtonClicked(views::View* source,
+                                              const gfx::Point& point) {
   DetailsGroup* group =
-      combobox == email_.suggested_input ? &email_ :
-      combobox == cc_.suggested_input ? &cc_ :
-      combobox == billing_.suggested_input ? &billing_ :
-      combobox == shipping_.suggested_input ? &shipping_ : NULL;
+      source == email_.suggested_button ? &email_ :
+      source == cc_.suggested_button ? &cc_ :
+      source == billing_.suggested_button ? &billing_ :
+      source == shipping_.suggested_button ? &shipping_ : NULL;
   DCHECK(group);
-  UpdateDetailsGroupState(*group);
-  GetWidget()->SetSize(GetWidget()->non_client_view()->GetPreferredSize());
+  views::MenuModelAdapter adapter(
+      controller_->MenuModelForSection(group->section));
+  menu_runner_.reset(new views::MenuRunner(adapter.CreateMenu()));
+
+  // Ignore the result since we don't need to handle a deleted menu specially.
+  ignore_result(
+      menu_runner_->RunMenuAt(source->GetWidget(),
+                              group->suggested_button,
+                              gfx::Rect(point, gfx::Size()),
+                              views::MenuItemView::TOPRIGHT,
+                              0));
 }
 
 void AutofillDialogViews::ContentsChanged(views::Textfield* sender,
                                           const string16& new_contents) {
   // TODO(estade): work for not billing.
   for (TextfieldMap::iterator iter = billing_.textfields.begin();
        iter != billing_.textfields.end();
        ++iter) {
     if (iter->second == sender) {
       controller_->UserEditedInput(iter->first,
@@ skipping 144 matching lines @@
   billing->AddChildView(use_billing_for_shipping_);
 
   // Container (holds label + inputs).
   views::View* container = CreateSectionContainer(
       controller_->LabelForSection(SECTION_BILLING), billing);
   billing_.container = container;
 }
 
 views::View* AutofillDialogViews::CreateInputsContainer(DialogSection section) {
   views::View* inputs_container = new views::View();
-  inputs_container->SetLayoutManager(
+  views::GridLayout* layout = new views::GridLayout(inputs_container);
+  inputs_container->SetLayoutManager(layout);
+
+  int kColumnSetId = 0;
+  views::ColumnSet* column_set = layout->AddColumnSet(kColumnSetId);
+  column_set->AddColumn(views::GridLayout::FILL,
+                        views::GridLayout::LEADING,
+                        1,
+                        views::GridLayout::USE_PREF,
+                        0,
+                        0);
+  column_set->AddColumn(views::GridLayout::CENTER,
+                        views::GridLayout::LEADING,
+                        0,
+                        views::GridLayout::USE_PREF,
+                        0,
+                        0);
+  layout->StartRow(0, kColumnSetId);
+
+  // The |info_view| holds |manual_inputs| and |suggested_info|, allowing the
+  // dialog toggle which is shown.
+  views::View* info_view = new views::View();
+  info_view->SetLayoutManager(
       new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 0));
   views::View* manual_inputs = InitInputsView(section);
-  inputs_container->AddChildView(manual_inputs);
-  views::Combobox* combobox =
-      new views::Combobox(controller_->ComboboxModelForSection(section));
-  combobox->set_listener(this);
-  inputs_container->AddChildView(combobox);
+  info_view->AddChildView(manual_inputs);
+  views::Label* suggested_info = new views::Label();
+  suggested_info->SetHorizontalAlignment(gfx::ALIGN_LEFT);
+  info_view->AddChildView(suggested_info);
+  layout->AddView(info_view);
+
+  // TODO(estade): Fix the appearance of this button.
+  views::MenuButton* menu_button =
+      new views::MenuButton(NULL, string16(), this, true);
+  layout->AddView(menu_button);
 
   DetailsGroup* group = GroupForSection(section);
-  group->suggested_input = combobox;
+  group->suggested_button = menu_button;
   group->manual_input = manual_inputs;
+  group->suggested_info = suggested_info;
   UpdateDetailsGroupState(*group);
   return inputs_container;
 }
 
 // TODO(estade): we should be using Chrome-style constrained window padding
 // values.
 views::View* AutofillDialogViews::InitInputsView(DialogSection section) {
   const DetailInputs& inputs = controller_->RequestedFieldsForSection(section);
   TextfieldMap* textfields = &GroupForSection(section)->textfields;
   ComboboxMap* comboboxes = &GroupForSection(section)->comboboxes;
@@ skipping 50 matching lines @@
       field->SetController(this);
       textfields->insert(std::make_pair(&input, field));
       layout->AddView(field);
     }
   }
 
   return view;
 }
 
 void AutofillDialogViews::UpdateDetailsGroupState(const DetailsGroup& group) {
-  views::Combobox* combobox = group.suggested_input;
-  int suggestion_count = combobox->model()->GetItemCount();
-  bool show_combobox = suggestion_count > 1 &&
-      combobox->selected_index() != suggestion_count - 1;
-
-  combobox->SetVisible(show_combobox);
-  group.manual_input->SetVisible(!show_combobox);
+  string16 suggestion_text =
+      controller_->SuggestionTextForSection(group.section);
+  group.manual_input->SetVisible(suggestion_text.empty());
+  group.suggested_info->SetVisible(!suggestion_text.empty());
+  group.suggested_info->SetText(suggestion_text);
+  if (GetWidget())
+    GetWidget()->SetSize(GetWidget()->non_client_view()->GetPreferredSize());
 }
 
 AutofillDialogViews::DetailsGroup* AutofillDialogViews::
     GroupForSection(DialogSection section) {
   switch (section) {
     case SECTION_EMAIL:
       return &email_;
     case SECTION_CC:
       return &cc_;
     case SECTION_BILLING:
       return &billing_;
     case SECTION_SHIPPING:
       return &shipping_;
   }
 
   NOTREACHED();
   return NULL;
 }
 
-AutofillDialogViews::DetailsGroup::DetailsGroup()
-    : container(NULL),
-      suggested_input(NULL),
-      manual_input(NULL) {}
+AutofillDialogViews::DetailsGroup::DetailsGroup(DialogSection section)
+    : section(section),
+      container(NULL),
+      manual_input(NULL),
+      suggested_info(NULL),
+      suggested_button(NULL) {}
 
 AutofillDialogViews::DetailsGroup::~DetailsGroup() {}
 
 }  // namespace autofill