| Index: chrome/browser/ui/views/autofill/autofill_dialog_views.h
|
| diff --git a/chrome/browser/ui/views/autofill/autofill_dialog_views.h b/chrome/browser/ui/views/autofill/autofill_dialog_views.h
|
| index 6e4df9b077575daab5cfe88c8409ec0f3eb60dbe..59627fc46fc567e41599df4e615b16c5fa6e3da1 100644
|
| --- a/chrome/browser/ui/views/autofill/autofill_dialog_views.h
|
| +++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.h
|
| @@ -81,9 +81,9 @@ class AutofillDialogViews : public AutofillDialogView,
|
| virtual void UpdateNotificationArea() OVERRIDE;
|
| virtual void UpdateSection(DialogSection section) OVERRIDE;
|
| virtual void FillSection(DialogSection section,
|
| - const DetailInput& originating_input) OVERRIDE;
|
| - virtual void GetUserInput(DialogSection section,
|
| - DetailOutputMap* output) OVERRIDE;
|
| + AutofillFieldType originating_input) OVERRIDE;
|
| + virtual void GetUserInput(DialogSection section, DetailOutputMap* output)
|
| + OVERRIDE;
|
| virtual string16 GetCvc() OVERRIDE;
|
| virtual bool SaveDetailsLocally() OVERRIDE;
|
| virtual const content::NavigationController* ShowSignIn() OVERRIDE;
|
| @@ -95,10 +95,13 @@ class AutofillDialogViews : public AutofillDialogView,
|
| // TestableAutofillDialogView implementation:
|
| virtual void SubmitForTesting() OVERRIDE;
|
| virtual void CancelForTesting() OVERRIDE;
|
| - virtual string16 GetTextContentsOfInput(const DetailInput& input) OVERRIDE;
|
| - virtual void SetTextContentsOfInput(const DetailInput& input,
|
| + virtual string16 GetTextContentsOfInput(DialogSection section,
|
| + AutofillFieldType type) OVERRIDE;
|
| + virtual void SetTextContentsOfInput(DialogSection section,
|
| + AutofillFieldType type,
|
| const string16& contents) OVERRIDE;
|
| - virtual void ActivateInput(const DetailInput& input) OVERRIDE;
|
| + virtual void ActivateInput(DialogSection section, AutofillFieldType type)
|
| + OVERRIDE;
|
|
|
| // views::DialogDelegate implementation:
|
| virtual string16 GetWindowTitle() const OVERRIDE;
|
| @@ -287,8 +290,8 @@ class AutofillDialogViews : public AutofillDialogView,
|
| DISALLOW_COPY_AND_ASSIGN(NotificationArea);
|
| };
|
|
|
| - typedef std::map<const DetailInput*, DecoratedTextfield*> TextfieldMap;
|
| - typedef std::map<const DetailInput*, views::Combobox*> ComboboxMap;
|
| + typedef std::map<AutofillFieldType, DecoratedTextfield*> TextfieldMap;
|
| + typedef std::map<AutofillFieldType, views::Combobox*> ComboboxMap;
|
|
|
| // A view that packs a label on the left and some related controls
|
| // on the right.
|
| @@ -468,13 +471,15 @@ class AutofillDialogViews : public AutofillDialogView,
|
| // Call this when the size of anything in |contents_| might've changed.
|
| void ContentsPreferredSizeChanged();
|
|
|
| - // Gets the textfield view that is shown for the given DetailInput model, or
|
| + // Gets the textfield view that is identified by |section| and |type|, or
|
| // NULL.
|
| - views::Textfield* TextfieldForInput(const DetailInput& input);
|
| + views::Textfield* TextfieldForInput(DialogSection section,
|
| + AutofillFieldType type);
|
|
|
| - // Gets the combobox view that is shown for the given DetailInput model, or
|
| + // Gets the combobox view that is identified by |section| and |type|, or
|
| // NULL.
|
| - views::Combobox* ComboboxForInput(const DetailInput& input);
|
| + views::Combobox* ComboboxForInput(DialogSection section,
|
| + AutofillFieldType type);
|
|
|
| // The controller that drives this view. Weak pointer, always non-NULL.
|
| AutofillDialogController* const controller_;
|
|
|