1 files changed, 21 insertions, 75 deletions

diff --git a/views/examples/textfield_example.h b/views/examples/textfield_example.h
index a448f9f..a94797b 100644
--- a/views/examples/textfield_example.h
+++ b/views/examples/textfield_example.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 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.
 
@@ -6,93 +6,39 @@
 #define VIEWS_EXAMPLES_TEXTFIELD_EXAMPLE_H_
 #pragma once
 
-#include "base/utf_string_conversions.h"
+#include <string>
+
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "base/string16.h"
 #include "views/controls/button/text_button.h"
-#include "views/controls/label.h"
-#include "views/controls/tabbed_pane/tabbed_pane.h"
 #include "views/controls/textfield/textfield.h"
 #include "views/examples/example_base.h"
 
 namespace examples {
 
-using views::Textfield;
-
 // TextfieldExample mimics login screen.
 class TextfieldExample : public ExampleBase,
-                         public Textfield::Controller,
+                         public views::Textfield::Controller,
                          public views::ButtonListener {
  public:
-  explicit TextfieldExample(ExamplesMain* main) : ExampleBase(main) {}
-
-  virtual ~TextfieldExample() {}
-
-  virtual std::wstring GetExampleTitle() {
-    return L"Textfield";
-  }
+  explicit TextfieldExample(ExamplesMain* main);
+  virtual ~TextfieldExample();
 
-  virtual void CreateExampleView(views::View* container) {
-    name_ = new Textfield();
-    password_ = new Textfield(Textfield::STYLE_PASSWORD);
-    password_->set_text_to_display_when_empty(ASCIIToUTF16("password"));
-    show_password_ = new views::TextButton(this, L"Show password");
-    clear_all_ = new views::TextButton(this, L"Clear All");
-    append_ = new views::TextButton(this, L"Append");
-    name_->SetController(this);
-    password_->SetController(this);
-
-    views::GridLayout* layout = new views::GridLayout(container);
-    container->SetLayoutManager(layout);
-
-    views::ColumnSet* column_set = layout->AddColumnSet(0);
-    column_set->AddColumn(views::GridLayout::LEADING, views::GridLayout::FILL,
-                          0.2f, views::GridLayout::USE_PREF, 0, 0);
-    column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
-                          0.8f, views::GridLayout::USE_PREF, 0, 0);
-    layout->StartRow(0, 0);
-    layout->AddView(new views::Label(L"Name:"));
-    layout->AddView(name_);
-    layout->StartRow(0, 0);
-    layout->AddView(new views::Label(L"Password:"));
-    layout->AddView(password_);
-    layout->StartRow(0, 0);
-    layout->AddView(show_password_);
-    layout->StartRow(0, 0);
-    layout->AddView(clear_all_);
-    layout->StartRow(0, 0);
-    layout->AddView(append_);
-  }
+  // Overridden from ExampleBase:
+  virtual std::wstring GetExampleTitle() OVERRIDE;
+  virtual void CreateExampleView(views::View* container) OVERRIDE;
 
  private:
-  // Textfield::Controller implementations:
-  // This method is called whenever the text in the field changes.
-  virtual void ContentsChanged(Textfield* sender,
-                               const string16& new_contents) {
-    if (sender == name_) {
-      PrintStatus(L"Name [%ls]", UTF16ToWideHack(new_contents).c_str());
-    } else if (sender == password_) {
-      PrintStatus(L"Password [%ls]", UTF16ToWideHack(new_contents).c_str());
-    }
-  }
-
-  // Let the control handle keystrokes.
-  virtual bool HandleKeyEvent(Textfield* sender,
-                              const views::KeyEvent& key_event) {
-    return false;
-  }
-
-  // ButtonListner implementation.
-  virtual void ButtonPressed(views::Button* sender, const views::Event& event) {
-    if (sender == show_password_) {
-      PrintStatus(L"Password [%ls]",
-                  UTF16ToWideHack(password_->text()).c_str());
-    } else if (sender == clear_all_) {
-      string16 empty;
-      name_->SetText(empty);
-      password_->SetText(empty);
-    } else if (sender == append_) {
-      name_->AppendText(WideToUTF16(L"[append]"));
-    }
-  }
+  // Overridden from views::Textfield::Controller:
+  virtual void ContentsChanged(views::Textfield* sender,
+                               const string16& new_contents) OVERRIDE;
+  virtual bool HandleKeyEvent(views::Textfield* sender,
+                              const views::KeyEvent& key_event) OVERRIDE;
+
+  // Overridden from views::ButtonListener:
+  virtual void ButtonPressed(views::Button* sender,
+                             const views::Event& event) OVERRIDE;
 
   // Textfields for name and password.
   views::Textfield* name_;