Index: chrome/browser/ui/input_window_dialog_win.cc |
diff --git a/chrome/browser/ui/input_window_dialog_win.cc b/chrome/browser/ui/input_window_dialog_win.cc |
index 268fa7bde094d83cbf551d48f8947f5d962af6bf..7012d10817d8b1281d467c99de3f235c68e02d78 100644 |
--- a/chrome/browser/ui/input_window_dialog_win.cc |
+++ b/chrome/browser/ui/input_window_dialog_win.cc |
@@ -10,6 +10,7 @@ |
#include "grit/generated_resources.h" |
#include "views/controls/label.h" |
#include "views/controls/textfield/textfield.h" |
+#include "views/controls/textfield/textfield_controller.h" |
#include "views/layout/grid_layout.h" |
#include "views/layout/layout_constants.h" |
#include "views/window/dialog_delegate.h" |
@@ -56,7 +57,7 @@ class WinInputWindowDialog : public InputWindowDialog { |
// It registers accelerators that accept/cancel the input. |
class ContentView : public views::View, |
public views::DialogDelegate, |
- public views::Textfield::Controller { |
+ public views::TextfieldController { |
public: |
explicit ContentView(WinInputWindowDialog* delegate) |
: delegate_(delegate), |
@@ -64,7 +65,7 @@ class ContentView : public views::View, |
DCHECK(delegate_); |
} |
- // views::DialogDelegate overrides: |
+ // views::DialogDelegate: |
virtual bool IsDialogButtonEnabled( |
MessageBoxFlags::DialogButton button) const; |
virtual bool Accept(); |
@@ -74,7 +75,7 @@ class ContentView : public views::View, |
virtual bool IsModal() const { return true; } |
virtual views::View* GetContentsView(); |
- // views::Textfield::Controller overrides: |
+ // views::TextfieldController: |
virtual void ContentsChanged(views::Textfield* sender, |
const std::wstring& new_contents); |
virtual bool HandleKeyEvent(views::Textfield*, |
@@ -83,8 +84,9 @@ class ContentView : public views::View, |
} |
protected: |
- // views::View overrides: |
- virtual void ViewHierarchyChanged(bool is_add, views::View* parent, |
+ // views::View: |
+ virtual void ViewHierarchyChanged(bool is_add, |
+ views::View* parent, |
views::View* child); |
private: |
@@ -142,7 +144,7 @@ views::View* ContentView::GetContentsView() { |
} |
/////////////////////////////////////////////////////////////////////////////// |
-// ContentView, views::Textfield::Controller implementation: |
+// ContentView, views::TextfieldController implementation: |
void ContentView::ContentsChanged(views::Textfield* sender, |
const std::wstring& new_contents) { |