Chromium Code Reviews| Index: ui/views/examples/multiline_example.h |
| diff --git a/ui/views/examples/multiline_example.h b/ui/views/examples/multiline_example.h |
| index bc5d8c8f5485e34e903522339181f47df72952ad..8afd4441bfa28f1680b6939e1df49adfb4fe0bca 100644 |
| --- a/ui/views/examples/multiline_example.h |
| +++ b/ui/views/examples/multiline_example.h |
| @@ -7,6 +7,7 @@ |
| #include "base/compiler_specific.h" |
| #include "base/strings/string16.h" |
| +#include "ui/views/controls/button/checkbox.h" |
| #include "ui/views/controls/textfield/textfield_controller.h" |
| #include "ui/views/examples/example_base.h" |
| @@ -18,7 +19,8 @@ namespace examples { |
| // An example that compares the multi-line rendering of different controls. |
| class MultilineExample : public ExampleBase, |
| - public TextfieldController { |
| + public TextfieldController, |
| + public ButtonListener { |
| public: |
| MultilineExample(); |
| virtual ~MultilineExample(); |
| @@ -26,6 +28,9 @@ class MultilineExample : public ExampleBase, |
| // ExampleBase: |
| virtual void CreateExampleView(View* container) OVERRIDE; |
| + // ButtonListener: |
| + virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE; |
| + |
| private: |
| class RenderTextView; |
| @@ -35,8 +40,11 @@ class MultilineExample : public ExampleBase, |
| virtual bool HandleKeyEvent(Textfield* sender, |
| const ui::KeyEvent& key_event) OVERRIDE; |
| + View* container_; |
|
msw
2013/07/17 06:47:18
Can you use a more descriptive name?
ckocagil
2013/07/19 19:40:50
Changed to |top_container_|.
|
| RenderTextView* render_text_view_; |
| Label* label_; |
| + View* label_container_; |
| + Checkbox* label_checkbox_; |
| Textfield* textfield_; |
| DISALLOW_COPY_AND_ASSIGN(MultilineExample); |