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

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

Issue 2406323002: CustomButton: restrict animation repaints to buttons that actually animate (Closed)
Patch Set: don't use bool(T*) Created 4 years, 2 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/button_example.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/button_example.cc
diff --git a/ui/views/examples/button_example.cc b/ui/views/examples/button_example.cc
index 18410cf614a2d9d07b718ad4830a71b4d488beb2..de882104bc39468e1e0ec4ba5eb4fc1183f7ab03 100644
--- a/ui/views/examples/button_example.cc
+++ b/ui/views/examples/button_example.cc
@@ -59,16 +59,19 @@ void ButtonExample::CreateExampleView(View* container) {
container->AddChildView(new BlueButton(this, ASCIIToUTF16("Blue Button")));
- container->AddChildView(
- MdTextButton::Create(nullptr, base::ASCIIToUTF16("Material design")));
- MdTextButton* md_button =
- MdTextButton::Create(nullptr, base::ASCIIToUTF16("Default"));
- md_button->SetIsDefault(true);
- container->AddChildView(md_button);
- md_button =
- MdTextButton::Create(nullptr, base::ASCIIToUTF16("Call to action"));
- md_button->SetProminent(true);
- container->AddChildView(md_button);
+ md_button_ =
+ MdTextButton::Create(this, base::ASCIIToUTF16("Material design"));
+ container->AddChildView(md_button_);
+
+ md_default_button_ =
+ MdTextButton::Create(this, base::ASCIIToUTF16("Default"));
+ md_default_button_->SetIsDefault(true);
+ container->AddChildView(md_default_button_);
+
+ md_prominent_button_ =
+ MdTextButton::Create(this, base::ASCIIToUTF16("Call to action"));
+ md_prominent_button_->SetProminent(true);
+ container->AddChildView(md_prominent_button_);
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
image_button_ = new ImageButton(this);
@@ -122,14 +125,18 @@ void ButtonExample::LabelButtonPressed(LabelButton* label_button,
}
void ButtonExample::ButtonPressed(Button* sender, const ui::Event& event) {
- if (sender == label_button_)
+ if (sender == label_button_) {
LabelButtonPressed(label_button_, event);
- else if (sender == styled_button_)
+ } else if (sender == styled_button_) {
LabelButtonPressed(styled_button_, event);
- else if (sender == disabled_button_)
+ } else if (sender == disabled_button_) {
LabelButtonPressed(disabled_button_, event);
- else
+ } else if (sender == md_button_ || sender == md_default_button_ ||
+ sender == md_prominent_button_) {
+ static_cast<CustomButton*>(sender)->StartThrobbing(5);
+ } else {
PrintStatus("Image Button Pressed! count: %d", ++count_);
+ }
}
} // namespace examples
« no previous file with comments | « ui/views/examples/button_example.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698