| 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..1ee04fe3c912c0760e8cbb5d6f86ae3fc8c8f6b0 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,10 @@ class MultilineExample : public ExampleBase,
|
| virtual bool HandleKeyEvent(Textfield* sender,
|
| const ui::KeyEvent& key_event) OVERRIDE;
|
|
|
| + View* top_container_;
|
| RenderTextView* render_text_view_;
|
| Label* label_;
|
| + Checkbox* label_checkbox_;
|
| Textfield* textfield_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(MultilineExample);
|
|
|