| Index: chrome/browser/ui/views/autofill/autofill_dialog_views.cc
|
| diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
|
| index 80cd053b47a69d5249095ba5f0078fca5c1cd2f0..8af71cc308ccea296ee37b8af0be635eaf3a5e5a 100644
|
| --- a/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
|
| +++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.cc
|
| @@ -1446,12 +1446,12 @@ void AutofillDialogViews::CancelForTesting() {
|
| }
|
|
|
| base::string16 AutofillDialogViews::GetTextContentsOfInput(
|
| - const DetailInput& input) {
|
| - views::Textfield* textfield = TextfieldForType(input.type);
|
| + ServerFieldType type) {
|
| + views::Textfield* textfield = TextfieldForType(type);
|
| if (textfield)
|
| return textfield->text();
|
|
|
| - views::Combobox* combobox = ComboboxForType(input.type);
|
| + views::Combobox* combobox = ComboboxForType(type);
|
| if (combobox)
|
| return combobox->model()->GetItemAt(combobox->selected_index());
|
|
|
| @@ -1460,17 +1460,17 @@ base::string16 AutofillDialogViews::GetTextContentsOfInput(
|
| }
|
|
|
| void AutofillDialogViews::SetTextContentsOfInput(
|
| - const DetailInput& input,
|
| + ServerFieldType type,
|
| const base::string16& contents) {
|
| - views::Textfield* textfield = TextfieldForType(input.type);
|
| + views::Textfield* textfield = TextfieldForType(type);
|
| if (textfield) {
|
| textfield->SetText(contents);
|
| return;
|
| }
|
|
|
| - views::Combobox* combobox = ComboboxForType(input.type);
|
| + views::Combobox* combobox = ComboboxForType(type);
|
| if (combobox) {
|
| - SelectComboboxValueOrSetToDefault(combobox, input.initial_value);
|
| + SelectComboboxValueOrSetToDefault(combobox, contents);
|
| return;
|
| }
|
|
|
| @@ -1484,8 +1484,8 @@ void AutofillDialogViews::SetTextContentsOfSuggestionInput(
|
| SetText(text);
|
| }
|
|
|
| -void AutofillDialogViews::ActivateInput(const DetailInput& input) {
|
| - TextfieldEditedOrActivated(TextfieldForType(input.type), false);
|
| +void AutofillDialogViews::ActivateInput(ServerFieldType type) {
|
| + TextfieldEditedOrActivated(TextfieldForType(type), false);
|
| }
|
|
|
| gfx::Size AutofillDialogViews::GetSize() const {
|
|
|