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

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

Issue 1750403005: [MD] some tweaks to download shelf (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: explicit Created 4 years, 9 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/animation/ink_drop_host_view.cc ('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/custom_button.h
diff --git a/ui/views/controls/button/custom_button.h b/ui/views/controls/button/custom_button.h
index dfd0384c4340fed7e40af5510a0ab06be78190d3..fa0a215d1007b47ea0078735afccd6b8d0d6bae2 100644
--- a/ui/views/controls/button/custom_button.h
+++ b/ui/views/controls/button/custom_button.h
@@ -103,6 +103,8 @@ class VIEWS_EXPORT CustomButton : public Button, public gfx::AnimationDelegate {
// Overridden from gfx::AnimationDelegate:
void AnimationProgressed(const gfx::Animation* animation) override;
+ InkDropDelegate* ink_drop_delegate() const { return ink_drop_delegate_; }
+
protected:
// Construct the Button with a Listener. See comment for Button's ctor.
explicit CustomButton(ButtonListener* listener);
@@ -135,7 +137,6 @@ class VIEWS_EXPORT CustomButton : public Button, public gfx::AnimationDelegate {
// state). This does not take into account enabled state.
bool ShouldEnterHoveredState();
- InkDropDelegate* ink_drop_delegate() const { return ink_drop_delegate_; }
void set_ink_drop_delegate(InkDropDelegate* ink_drop_delegate) {
ink_drop_delegate_ = ink_drop_delegate;
}
« no previous file with comments | « ui/views/animation/ink_drop_host_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698