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

Unified Diff: ui/views/controls/button/custom_button.h

Issue 2675893002: Remove some pre-md code from TrayPopupUtils and UserView. (Closed)
Patch Set: Created 3 years, 11 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
Index: ui/views/controls/button/custom_button.h
diff --git a/ui/views/controls/button/custom_button.h b/ui/views/controls/button/custom_button.h
index 5717762cf71be0cebf0eb5010d404de98da1f7aa..03af0ad3494ad50dec55988cb7e2522cdbd770f6 100644
--- a/ui/views/controls/button/custom_button.h
+++ b/ui/views/controls/button/custom_button.h
@@ -97,6 +97,9 @@ class VIEWS_EXPORT CustomButton : public Button, public gfx::AnimationDelegate {
}
void set_ink_drop_base_color(SkColor color) { ink_drop_base_color_ = color; }
+ void set_has_ink_drop_action_on_click(bool has_ink_drop_action_on_click) {
+ has_ink_drop_action_on_click_ = has_ink_drop_action_on_click;
+ }
void SetHotTracked(bool is_hot_tracked);
bool IsHotTracked() const;
@@ -153,10 +156,6 @@ class VIEWS_EXPORT CustomButton : public Button, public gfx::AnimationDelegate {
// we simply return IsTriggerableEvent(event).
virtual bool ShouldEnterPushedState(const ui::Event& event);
- void set_has_ink_drop_action_on_click(bool has_ink_drop_action_on_click) {
- has_ink_drop_action_on_click_ = has_ink_drop_action_on_click;
- }
-
// Returns true if the button should enter hovered state; that is, if the
// mouse is over the button, and no other window has capture (which would
// prevent the button from receiving MouseExited events and updating its
« ash/common/system/user/user_view.cc ('K') | « ui/views/animation/ink_drop_host_view.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698