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 030faa810d10a889f644f2e14113771b12b4f14a..440fed4436b98b85ccaaf4de7729ce46014fed3d 100644 |
--- a/ui/views/animation/ink_drop_host_view.h |
+++ b/ui/views/animation/ink_drop_host_view.h |
@@ -38,6 +38,16 @@ class VIEWS_EXPORT InkDropHostView : public View, public InkDropHost { |
void set_ink_drop_size(const gfx::Size& size) { ink_drop_size_ = size; } |
protected: |
+ // Used in SetInkDropMode() to specify whether the ink drop effect is enabled |
+ // or not for the view. In case of having an ink drop, it also specifies |
+ // whether the default gesture event handler for the ink drop should be |
+ // installed or the subclass will handle gesture events itself. |
+ enum InkDropMode { |
+ NO_INK_DROP, |
+ INK_DROP_WITHOUT_GESTURE_HANDLING, |
+ INK_DROP_WITH_GESTURE_HANDLING, |
sky
2016/06/30 00:35:34
Sorry, one concern I have in looking at the change
mohsen
2016/06/30 08:54:07
Having two separate functions makes the code a bit
|
+ }; |
+ |
static const int kInkDropSmallCornerRadius; |
void set_ink_drop_visible_opacity(float visible_opacity) { |
@@ -84,7 +94,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 SetInkDropMode(InkDropMode ink_drop_mode); |
private: |
class InkDropGestureHandler; |