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

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

Issue 1920783003: Fixed Back/Forward buttons to not hide ink drop when long press shows drop down menu. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 | « chrome/browser/ui/views/toolbar/toolbar_view.cc ('k') | ui/views/controls/button/custom_button.cc » ('j') | 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 d3fbdfa214a281ce7862cf758ce6caee1f7f5c98..afcefbe9bf8441fc06fb3b4d6b8c7a0576a153ef 100644
--- a/ui/views/controls/button/custom_button.h
+++ b/ui/views/controls/button/custom_button.h
@@ -76,6 +76,12 @@ class VIEWS_EXPORT CustomButton : public Button, public gfx::AnimationDelegate {
notify_action_ = notify_action;
}
+ void set_hide_ink_drop_when_showing_context_menu(
+ bool hide_ink_drop_when_showing_context_menu) {
+ hide_ink_drop_when_showing_context_menu_ =
+ hide_ink_drop_when_showing_context_menu;
+ }
+
void set_ink_drop_base_color(SkColor color) { ink_drop_base_color_ = color; }
void SetHotTracked(bool is_hot_tracked);
@@ -197,6 +203,10 @@ class VIEWS_EXPORT CustomButton : public Button, public gfx::AnimationDelegate {
// is clicked.
InkDropState ink_drop_action_on_click_;
+ // When true, the ink drop ripple and hover will be hidden prior to showing
+ // the context menu.
+ bool hide_ink_drop_when_showing_context_menu_;
+
// The color of the ripple and hover.
SkColor ink_drop_base_color_;
« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_view.cc ('k') | ui/views/controls/button/custom_button.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698