Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(217)

Unified Diff: ui/views/examples/multiline_example.h

Issue 16867016: Windows implementation of multiline RenderText (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: min height/baseline; update tests Created 7 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/examples/example_base.h ('k') | ui/views/examples/multiline_example.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..2757c4ac9332e3969ddec3a561822bcfd6c45122 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"
@@ -16,9 +17,10 @@ class Label;
namespace examples {
-// An example that compares the multi-line rendering of different controls.
+// An example that compares the multiline 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;
@@ -39,6 +44,9 @@ class MultilineExample : public ExampleBase,
Label* label_;
Textfield* textfield_;
+ // Checkbox to enable and disable text rendering in |label_|.
+ Checkbox* label_checkbox_;
+
DISALLOW_COPY_AND_ASSIGN(MultilineExample);
};
« no previous file with comments | « ui/views/examples/example_base.h ('k') | ui/views/examples/multiline_example.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698