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

Unified Diff: ui/views/animation/ink_drop_host_view.h

Issue 2070143003: Add MD ink drop ripple to app list button (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@b612539_shelf_button_ripple
Patch Set: Addressed review comments Created 4 years, 6 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/app_list/presenter/app_list_presenter_impl.h ('k') | ui/views/animation/ink_drop_host_view.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/ink_drop_host_view.h
diff --git a/ui/views/animation/ink_drop_host_view.h b/ui/views/animation/ink_drop_host_view.h
index c3fa8d8cbb9040d5025d6a0c64b14e1d547e69eb..b5e841917728b7ef605615d738bd2ffb4e2d4355 100644
--- a/ui/views/animation/ink_drop_host_view.h
+++ b/ui/views/animation/ink_drop_host_view.h
@@ -38,6 +38,12 @@ class VIEWS_EXPORT InkDropHostView : public View, public InkDropHost {
void set_ink_drop_size(const gfx::Size& size) { ink_drop_size_ = size; }
protected:
+ enum InkDropType {
+ NO_INK_DROP,
+ INK_DROP_WITHOUT_GESTURE_HANDLING,
James Cook 2016/06/27 22:47:28 I like this much better. Can you add a brief comme
mohsen 2016/06/29 21:41:37 Done.
+ INK_DROP_WITH_GESTURE_HANDLING,
+ };
+
static const int kInkDropSmallCornerRadius;
void set_ink_drop_visible_opacity(float visible_opacity) {
@@ -84,7 +90,7 @@ class VIEWS_EXPORT InkDropHostView : public View, public InkDropHost {
// Toggle to enable/disable an InkDrop on this View. Descendants can override
// CreateInkDropHighlight() and CreateInkDropRipple() to change the look/feel
// of the InkDrop.
- void SetHasInkDrop(bool has_an_ink_drop);
+ void SetHasInkDrop(InkDropType ink_drop_type);
private:
class InkDropGestureHandler;
« no previous file with comments | « ui/app_list/presenter/app_list_presenter_impl.h ('k') | ui/views/animation/ink_drop_host_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698