| Index: ui/views/examples/textfield_example.cc
|
| diff --git a/ui/views/examples/textfield_example.cc b/ui/views/examples/textfield_example.cc
|
| index 62d70a0740fdab18d726381e1fc7fa27c4972bdb..6d9c505d2a50c73cf40fd69bab411ed61cb725a1 100644
|
| --- a/ui/views/examples/textfield_example.cc
|
| +++ b/ui/views/examples/textfield_example.cc
|
| @@ -17,7 +17,16 @@
|
| namespace views {
|
| namespace examples {
|
|
|
| -TextfieldExample::TextfieldExample() : ExampleBase("Textfield") {
|
| +TextfieldExample::TextfieldExample()
|
| + : ExampleBase("Textfield"),
|
| + name_(NULL),
|
| + password_(NULL),
|
| + read_only_(NULL),
|
| + show_password_(NULL),
|
| + clear_all_(NULL),
|
| + append_(NULL),
|
| + set_(NULL),
|
| + set_style_(NULL) {
|
| }
|
|
|
| TextfieldExample::~TextfieldExample() {
|
| @@ -27,6 +36,9 @@ void TextfieldExample::CreateExampleView(View* container) {
|
| name_ = new Textfield();
|
| password_ = new Textfield(Textfield::STYLE_OBSCURED);
|
| password_->set_placeholder_text(ASCIIToUTF16("password"));
|
| + read_only_ = new Textfield();
|
| + read_only_->SetReadOnly(true);
|
| + read_only_->SetText(ASCIIToUTF16("read only"));
|
| show_password_ = new LabelButton(this, ASCIIToUTF16("Show password"));
|
| clear_all_ = new LabelButton(this, ASCIIToUTF16("Clear All"));
|
| append_ = new LabelButton(this, ASCIIToUTF16("Append"));
|
| @@ -50,6 +62,9 @@ void TextfieldExample::CreateExampleView(View* container) {
|
| layout->AddView(new Label(ASCIIToUTF16("Password:")));
|
| layout->AddView(password_);
|
| layout->StartRow(0, 0);
|
| + layout->AddView(new Label(ASCIIToUTF16("Read Only:")));
|
| + layout->AddView(read_only_);
|
| + layout->StartRow(0, 0);
|
| layout->AddView(show_password_);
|
| layout->StartRow(0, 0);
|
| layout->AddView(clear_all_);
|
| @@ -67,6 +82,8 @@ void TextfieldExample::ContentsChanged(Textfield* sender,
|
| PrintStatus("Name [%s]", UTF16ToUTF8(new_contents).c_str());
|
| } else if (sender == password_) {
|
| PrintStatus("Password [%s]", UTF16ToUTF8(new_contents).c_str());
|
| + } else if (sender == read_only_) {
|
| + PrintStatus("Read Only [%s]", UTF16ToUTF8(new_contents).c_str());
|
| }
|
| }
|
|
|
| @@ -88,10 +105,15 @@ void TextfieldExample::ButtonPressed(Button* sender, const ui::Event& event) {
|
| string16 empty;
|
| name_->SetText(empty);
|
| password_->SetText(empty);
|
| + read_only_->SetText(empty);
|
| } else if (sender == append_) {
|
| name_->AppendText(ASCIIToUTF16("[append]"));
|
| + password_->AppendText(ASCIIToUTF16("[append]"));
|
| + read_only_->AppendText(ASCIIToUTF16("[append]"));
|
| } else if (sender == set_) {
|
| name_->SetText(ASCIIToUTF16("[set]"));
|
| + password_->SetText(ASCIIToUTF16("[set]"));
|
| + read_only_->SetText(ASCIIToUTF16("[set]"));
|
| } else if (sender == set_style_) {
|
| if (!name_->text().empty()) {
|
| name_->SetColor(SK_ColorGREEN);
|
|
|