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

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

Issue 1569113002: MacViews: Style BUTTON_STYLE buttons using the "modern" UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: respond to comments Created 4 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/label_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 566d3f09bf2e085c68902fa462a67ac037688e81..956759cf412c0d808eb21bd843f2e4603087cf8c 100644
--- a/ui/views/examples/button_example.h
+++ b/ui/views/examples/button_example.h
@@ -27,19 +27,21 @@ class VIEWS_EXAMPLES_EXPORT ButtonExample : public ExampleBase,
void CreateExampleView(View* container) override;
private:
- void LabelButtonPressed(const ui::Event& event);
+ void LabelButtonPressed(LabelButton* label_button, const ui::Event& event);
// ButtonListener:
void ButtonPressed(Button* sender, const ui::Event& event) override;
// Example buttons.
- LabelButton* label_button_;
- ImageButton* image_button_;
+ LabelButton* label_button_ = nullptr;
+ LabelButton* styled_button_ = nullptr;
+ LabelButton* disabled_button_ = nullptr;
+ ImageButton* image_button_ = nullptr;
- const gfx::ImageSkia* icon_;
+ const gfx::ImageSkia* icon_ = nullptr;
// The number of times the buttons are pressed.
- int count_;
+ int count_ = 0;
DISALLOW_COPY_AND_ASSIGN(ButtonExample);
};
« no previous file with comments | « ui/views/controls/button/label_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