| 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 d076667094cb8633465be9bd7df763bd0944b7be..a7a358c8b0b7f171f0922458da3c19b8144f4671 100644
|
| --- a/chrome/browser/ui/views/autofill/autofill_dialog_views.h
|
| +++ b/chrome/browser/ui/views/autofill/autofill_dialog_views.h
|
| @@ -10,8 +10,8 @@
|
| #include "base/memory/scoped_vector.h"
|
| #include "base/memory/weak_ptr.h"
|
| #include "base/scoped_observer.h"
|
| -#include "chrome/browser/ui/autofill/autofill_dialog_controller.h"
|
| #include "chrome/browser/ui/autofill/autofill_dialog_view.h"
|
| +#include "chrome/browser/ui/autofill/autofill_dialog_view_delegate.h"
|
| #include "chrome/browser/ui/autofill/testable_autofill_dialog_view.h"
|
| #include "ui/base/animation/animation_delegate.h"
|
| #include "ui/views/controls/button/button.h"
|
| @@ -74,7 +74,7 @@ class AutofillDialogViews : public AutofillDialogView,
|
| public views::ComboboxListener,
|
| public views::StyledLabelListener {
|
| public:
|
| - explicit AutofillDialogViews(AutofillDialogController* controller);
|
| + explicit AutofillDialogViews(AutofillDialogViewDelegate* controller);
|
| virtual ~AutofillDialogViews();
|
|
|
| // AutofillDialogView implementation:
|
| @@ -203,7 +203,7 @@ class AutofillDialogViews : public AutofillDialogView,
|
| public views::LinkListener,
|
| public base::SupportsWeakPtr<AccountChooser> {
|
| public:
|
| - explicit AccountChooser(AutofillDialogController* controller);
|
| + explicit AccountChooser(AutofillDialogViewDelegate* controller);
|
| virtual ~AccountChooser();
|
|
|
| // Updates the view based on the state that |controller_| reports.
|
| @@ -230,7 +230,7 @@ class AutofillDialogViews : public AutofillDialogView,
|
| views::Link* link_;
|
|
|
| // The controller |this| queries for logic and state.
|
| - AutofillDialogController* controller_;
|
| + AutofillDialogViewDelegate* controller_;
|
|
|
| // Runs the suggestion menu (triggered by each section's |suggested_button|.
|
| scoped_ptr<views::MenuRunner> menu_runner_;
|
| @@ -296,7 +296,7 @@ class AutofillDialogViews : public AutofillDialogView,
|
| class NotificationArea : public views::View,
|
| public views::ButtonListener {
|
| public:
|
| - explicit NotificationArea(AutofillDialogController* controller);
|
| + explicit NotificationArea(AutofillDialogViewDelegate* controller);
|
| virtual ~NotificationArea();
|
|
|
| // Displays the given notifications.
|
| @@ -324,7 +324,7 @@ class AutofillDialogViews : public AutofillDialogView,
|
|
|
| // A reference to the controller than owns this view. Used to report when
|
| // checkboxes change their values.
|
| - AutofillDialogController* controller_; // weak
|
| + AutofillDialogViewDelegate* controller_; // weak
|
|
|
| // The currently showing checkbox, or NULL if none exists.
|
| views::Checkbox* checkbox_; // weak
|
| @@ -555,7 +555,7 @@ class AutofillDialogViews : public AutofillDialogView,
|
| void DetailsContainerBoundsChanged();
|
|
|
| // The controller that drives this view. Weak pointer, always non-NULL.
|
| - AutofillDialogController* const controller_;
|
| + AutofillDialogViewDelegate* const controller_;
|
|
|
| // The window that displays |contents_|. Weak pointer; may be NULL when the
|
| // dialog is closing.
|
|
|