| Index: chrome/browser/ui/views/autofill/card_unmask_prompt_views.h
|
| diff --git a/chrome/browser/ui/views/autofill/card_unmask_prompt_views.h b/chrome/browser/ui/views/autofill/card_unmask_prompt_views.h
|
| index a677b12124441767ac14270fe93053e94321fe87..d6a206df4c383454710e6351b6e4fd7705e43439 100644
|
| --- a/chrome/browser/ui/views/autofill/card_unmask_prompt_views.h
|
| +++ b/chrome/browser/ui/views/autofill/card_unmask_prompt_views.h
|
| @@ -34,11 +34,11 @@ namespace autofill {
|
| class DecoratedTextfield;
|
|
|
| class CardUnmaskPromptViews : public CardUnmaskPromptView,
|
| - views::ComboboxListener,
|
| - views::DialogDelegateView,
|
| - views::TextfieldController,
|
| - views::LinkListener,
|
| - gfx::AnimationDelegate {
|
| + public views::ComboboxListener,
|
| + public views::DialogDelegateView,
|
| + public views::TextfieldController,
|
| + public views::LinkListener,
|
| + public gfx::AnimationDelegate {
|
| public:
|
| CardUnmaskPromptViews(CardUnmaskPromptController* controller,
|
| content::WebContents* web_contents);
|
| @@ -53,7 +53,7 @@ class CardUnmaskPromptViews : public CardUnmaskPromptView,
|
|
|
| // views::DialogDelegateView
|
| View* GetContentsView() override;
|
| - views::View* CreateFootnoteView() override;
|
| + View* CreateFootnoteView() override;
|
|
|
| // views::View
|
| gfx::Size GetPreferredSize() const override;
|
| @@ -63,11 +63,10 @@ class CardUnmaskPromptViews : public CardUnmaskPromptView,
|
| ui::ModalType GetModalType() const override;
|
| base::string16 GetWindowTitle() const override;
|
| void DeleteDelegate() override;
|
| - int GetDialogButtons() const override;
|
| base::string16 GetDialogButtonLabel(ui::DialogButton button) const override;
|
| bool ShouldDefaultButtonBeBlue() const override;
|
| bool IsDialogButtonEnabled(ui::DialogButton button) const override;
|
| - views::View* GetInitiallyFocusedView() override;
|
| + View* GetInitiallyFocusedView() override;
|
| bool Cancel() override;
|
| bool Accept() override;
|
|
|
| @@ -88,7 +87,7 @@ class CardUnmaskPromptViews : public CardUnmaskPromptView,
|
| friend class CardUnmaskPromptViewTesterViews;
|
|
|
| // A view that allows changing the opacity of its contents.
|
| - class FadeOutView : public views::View {
|
| + class FadeOutView : public View {
|
| public:
|
| FadeOutView();
|
| ~FadeOutView() override;
|
| @@ -125,7 +124,7 @@ class CardUnmaskPromptViews : public CardUnmaskPromptView,
|
| CardUnmaskPromptController* controller_;
|
| content::WebContents* web_contents_;
|
|
|
| - views::View* main_contents_;
|
| + View* main_contents_;
|
|
|
| // Expository language at the top of the dialog.
|
| views::Label* instructions_;
|
| @@ -134,7 +133,7 @@ class CardUnmaskPromptViews : public CardUnmaskPromptView,
|
| views::Label* permanent_error_label_;
|
|
|
| // Holds the cvc and expiration inputs.
|
| - views::View* input_row_;
|
| + View* input_row_;
|
|
|
| DecoratedTextfield* cvc_input_;
|
|
|
|
|