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

Unified Diff: ui/views/controls/button/menu_button.cc

Issue 2680643002: Add old_state parameter to CustomButton::StateChanged (Closed)
Patch Set: Created 3 years, 10 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/menu_button.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/button/menu_button.cc
diff --git a/ui/views/controls/button/menu_button.cc b/ui/views/controls/button/menu_button.cc
index c4e986b901dec1ffc93d7303a173d3e1e234b968..173194bedf5cfe9e7a2aff730a620d1b3d84109d 100644
--- a/ui/views/controls/button/menu_button.cc
+++ b/ui/views/controls/button/menu_button.cc
@@ -345,7 +345,7 @@ bool MenuButton::ShouldEnterPushedState(const ui::Event& event) {
return IsTriggerableEventType(event);
}
-void MenuButton::StateChanged() {
+void MenuButton::StateChanged(ButtonState old_state) {
if (pressed_lock_count_ != 0) {
// The button's state was changed while it was supposed to be locked in a
// pressed state. This shouldn't happen, but conceivably could if a caller
@@ -356,7 +356,7 @@ void MenuButton::StateChanged() {
else if (state() == STATE_DISABLED)
should_disable_after_press_ = true;
} else {
- LabelButton::StateChanged();
+ LabelButton::StateChanged(old_state);
}
}
« no previous file with comments | « ui/views/controls/button/menu_button.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698