Index: chrome/browser/chromeos/login/new_user_view.h |
diff --git a/chrome/browser/chromeos/login/new_user_view.h b/chrome/browser/chromeos/login/new_user_view.h |
index 9762f94beb29b4c81d136937ebb494b53b322fa4..3d3010b43842d77e0725035ed8e3ef1360efc8c9 100644 |
--- a/chrome/browser/chromeos/login/new_user_view.h |
+++ b/chrome/browser/chromeos/login/new_user_view.h |
@@ -1,4 +1,4 @@ |
-// Copyright (c) 2010 The Chromium Authors. All rights reserved. |
+// Copyright (c) 2011 The Chromium Authors. All rights reserved. |
// Use of this source code is governed by a BSD-style license that can be |
// found in the LICENSE file. |
@@ -15,7 +15,7 @@ |
#include "views/accelerator.h" |
#include "views/controls/button/button.h" |
#include "views/controls/link.h" |
-#include "views/controls/textfield/textfield.h" |
+#include "views/controls/textfield/textfield_controller.h" |
#include "views/view.h" |
namespace views { |
@@ -30,7 +30,7 @@ namespace chromeos { |
// allows to specify language preferences or initiate new account creation. |
class NewUserView : public ThrobberHostView, |
public UserInput, |
- public views::Textfield::Controller, |
+ public views::TextfieldController, |
public views::LinkController, |
public views::ButtonListener { |
public: |
@@ -75,7 +75,7 @@ class NewUserView : public ThrobberHostView, |
// Returns bounds of username field in screen coordinates. |
gfx::Rect GetUsernameBounds() const; |
- // Overridden from views::View: |
+ // views::View: |
virtual gfx::Size GetPreferredSize(); |
virtual void Layout(); |
virtual void RequestFocus(); |
@@ -87,24 +87,24 @@ class NewUserView : public ThrobberHostView, |
// Attempt to login with the current field values. |
void Login(); |
- // Overridden from views::Textfield::Controller |
+ // views::TextfieldController: |
// Not thread-safe, by virtue of using SetupSession(). |
virtual bool HandleKeyEvent(views::Textfield* sender, |
const views::KeyEvent& keystroke); |
virtual void ContentsChanged(views::Textfield* sender, |
const string16& new_contents); |
- // Overridden from views::ButtonListener. |
+ // views::ButtonListener: |
virtual void ButtonPressed(views::Button* sender, const views::Event& event); |
- // Overridden from views::LinkController. |
+ // views::LinkController: |
virtual void LinkActivated(views::Link* source, int event_flags); |
virtual bool AcceleratorPressed(const views::Accelerator& accelerator); |
- // Overridden from ThrobberHostView: |
+ // ThrobberHostView: |
virtual gfx::Rect CalculateThrobberBounds(views::Throbber* throbber); |
- // Overridden from UserInput: |
+ // UserInput: |
virtual void EnableInputControls(bool enabled); |
virtual void ClearAndFocusControls(); |
virtual void ClearAndFocusPassword(); |
@@ -115,7 +115,7 @@ class NewUserView : public ThrobberHostView, |
bool NavigateAway(); |
protected: |
- // views::View overrides: |
+ // views::View: |
virtual void ViewHierarchyChanged(bool is_add, |
views::View *parent, |
views::View *child); |