Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / views / autofill / autofill_dialog_views.h

diff --git a/src/chrome/browser/ui/views/autofill/autofill_dialog_views.h b/src/chrome/browser/ui/views/autofill/autofill_dialog_views.h
index 5d7b580..0c6270c 100644 (file)
--- a/src/chrome/browser/ui/views/autofill/autofill_dialog_views.h
+++ b/src/chrome/browser/ui/views/autofill/autofill_dialog_views.h
@@ -14,7 +14,6 @@
 #include "chrome/browser/ui/autofill/autofill_dialog_types.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/views/controls/button/button.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/controls/button/menu_button_listener.h"
@@ -61,7 +60,6 @@ class InfoBubble;
 // Views toolkit implementation of the Autofill dialog that handles the
 // imperative autocomplete API call.
 class AutofillDialogViews : public AutofillDialogView,
-                            public TestableAutofillDialogView,
                             public views::DialogDelegateView,
                             public views::WidgetObserver,
                             public views::TextfieldController,
@@ -97,22 +95,8 @@ class AutofillDialogViews : public AutofillDialogView,
   virtual const content::NavigationController* ShowSignIn() OVERRIDE;
   virtual void HideSignIn() OVERRIDE;
   virtual void ModelChanged() OVERRIDE;
-  virtual TestableAutofillDialogView* GetTestableView() OVERRIDE;
   virtual void OnSignInResize(const gfx::Size& pref_size) OVERRIDE;
-
-  // TestableAutofillDialogView implementation:
-  virtual void SubmitForTesting() OVERRIDE;
-  virtual void CancelForTesting() OVERRIDE;
-  virtual base::string16 GetTextContentsOfInput(ServerFieldType type) OVERRIDE;
-  virtual void SetTextContentsOfInput(ServerFieldType type,
-                                      const base::string16& contents) OVERRIDE;
-  virtual void SetTextContentsOfSuggestionInput(
-      DialogSection section,
-      const base::string16& text) OVERRIDE;
-  virtual void ActivateInput(ServerFieldType type) OVERRIDE;
-  virtual gfx::Size GetSize() const OVERRIDE;
-  virtual content::WebContents* GetSignInWebContents() OVERRIDE;
-  virtual bool IsShowingOverlay() const OVERRIDE;
+  virtual void ValidateSection(DialogSection section) OVERRIDE;
 
   // views::View implementation.
   virtual gfx::Size GetPreferredSize() OVERRIDE;
@@ -137,8 +121,6 @@ class AutofillDialogViews : public AutofillDialogView,
   virtual views::View* CreateFootnoteView() OVERRIDE;
   virtual bool Cancel() OVERRIDE;
   virtual bool Accept() OVERRIDE;
-  virtual views::NonClientFrameView* CreateNonClientFrameView(
-      views::Widget* widget) OVERRIDE;
 
   // views::WidgetObserver implementation:
   virtual void OnWidgetClosing(views::Widget* widget) OVERRIDE;
@@ -160,7 +142,7 @@ class AutofillDialogViews : public AutofillDialogView,
                                 views::View* focused_now) OVERRIDE;
 
   // views::ComboboxListener implementation:
-  virtual void OnSelectedIndexChanged(views::Combobox* combobox) OVERRIDE;
+  virtual void OnPerformAction(views::Combobox* combobox) OVERRIDE;
 
   // views::StyledLabelListener implementation:
   virtual void StyledLabelLinkClicked(const gfx::Range& range, int event_flags)
@@ -178,6 +160,8 @@ class AutofillDialogViews : public AutofillDialogView,
   views::View* GetScrollableAreaForTesting();
 
  private:
+  friend class AutofillDialogViewTesterViews;
+
   // What the entire dialog should be doing (e.g. gathering info from the user,
   // asking the user to sign in, etc.).
   enum DialogMode {