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

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

Issue 10174014: views: Add optional overlay image to ImageButton (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: remove debugging tweak Created 8 years, 8 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/controls/button/image_button_unittest.cc ('k') | ui/views/examples/button_example.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/button_example.h
diff --git a/ui/views/examples/button_example.h b/ui/views/examples/button_example.h
index 64b914fb099d88989a0f26ceca8a55446f8a7b6d..da0970ca4ba3222f719bcf1edad077dd86dbff26 100644
--- a/ui/views/examples/button_example.h
+++ b/ui/views/examples/button_example.h
@@ -12,6 +12,8 @@
#include "ui/views/examples/example_base.h"
namespace views {
+
+class ImageButton;
class View;
namespace examples {
@@ -29,15 +31,16 @@ class ButtonExample : public ExampleBase, public ButtonListener {
// Overridden from ButtonListener:
virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE;
- // The only control in this test.
- TextButton* button_;
+ // Example buttons.
+ TextButton* text_button_;
+ ImageButton* image_button_;
// Values used to modify the look and feel of the button.
TextButton::TextAlignment alignment_;
bool use_native_theme_border_;
const SkBitmap* icon_;
- // The number of times the button is pressed.
+ // The number of times the buttons are pressed.
int count_;
DISALLOW_COPY_AND_ASSIGN(ButtonExample);
« no previous file with comments | « ui/views/controls/button/image_button_unittest.cc ('k') | ui/views/examples/button_example.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698