support CC expiration dates in imperative autocomplete dialog.

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 "base/string_number_conversions.h"
 #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 "ui/views/border.h"
 #include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/combobox/combobox.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/separator.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/box_layout.h"
@@ skipping 81 matching lines @@
   return GroupForSection(section)->suggested_input->selected_index();
 }
 
 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 23 matching lines @@
 
 bool AutofillDialogViews::IsDialogButtonEnabled(ui::DialogButton button) const {
   return button == ui::DIALOG_BUTTON_OK ?
       controller_->ConfirmButtonEnabled() : true;
 }
 
 bool AutofillDialogViews::UseChromeStyle() const {
   return true;
 }
 
-ui::ModalType AutofillDialogViews::GetModalType() const {
-#if defined(USE_ASH)
-  return ui::MODAL_TYPE_CHILD;
-#else
-  return views::WidgetDelegate::GetModalType();
-#endif
-}
-
 bool AutofillDialogViews::Cancel() {
   return true;
 }
 
 bool AutofillDialogViews::Accept() {
   did_submit_ = true;
   return true;
 }
 
 void AutofillDialogViews::ButtonPressed(views::Button* sender,
@@ skipping 124 matching lines @@
   group->manual_input = manual_inputs;
   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;
 
   views::View* view = new views::View();
   views::GridLayout* layout = new views::GridLayout(view);
   view->SetLayoutManager(layout);
 
   for (DetailInputs::const_iterator it = inputs.begin();
        it != inputs.end(); ++it) {
     const DetailInput& input = *it;
     if (!controller_->ShouldShowInput(input))
       continue;
@@ skipping 15 matching lines @@
     }
 
     float expand = input.expand_weight;
     column_set->AddColumn(views::GridLayout::FILL,
                           views::GridLayout::BASELINE,
                           expand ? expand : 1,
                           views::GridLayout::USE_PREF,
                           0,
                           0);
 
-    views::Textfield* field = new views::Textfield();
-    field->set_placeholder_text(ASCIIToUTF16(input.placeholder_text));
-    field->SetText(input.starting_value);
-    textfields->insert(std::make_pair(&input, field));
-    layout->AddView(field);
+    ui::ComboboxModel* input_model =
+        controller_->ComboboxModelForAutofillType(input.type);
+    // TODO(estade): TextFields and Comboboxes need to be the same height.

[sky, 2012/11/29 16:30:24]

You should be able to do that by specifying a vertical alignment of FILL.

[Evan Stade, 2012/11/29 19:50:52]

yea, but that would only fix comboboxes and textfields on the same line, right?
I think it will look weird if all textfields aren't the same height.

+    if (input_model) {
+      views::Combobox* combobox = new views::Combobox(input_model);
+      int starting_value;
+      if (base::StringToInt(input.starting_value, &starting_value))
+        combobox->SetSelectedIndex(starting_value);
+      comboboxes->insert(std::make_pair(&input, combobox));
+      layout->AddView(combobox);
+    } else {
+      views::Textfield* field = new views::Textfield();
+      field->set_placeholder_text(ASCIIToUTF16(input.placeholder_text));
+      field->SetText(input.starting_value);
+      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;
@@ skipping 20 matching lines @@
 }
 
 AutofillDialogViews::DetailsGroup::DetailsGroup()
     : container(NULL),
       suggested_input(NULL),
       manual_input(NULL) {}
 
 AutofillDialogViews::DetailsGroup::~DetailsGroup() {}
 
 }  // namespace autofill