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

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

Issue 2289403002: Making SetInkDropMode public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixing unit test v2.0 Created 4 years, 4 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 | « no previous file | ui/views/animation/ink_drop_host_view_unittest.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 2f30b24b3b7e5eb6df158dcd839f7f634ede875e..b7e36c70b49d135d3ce6e341b65ceb686c199bbc 100644
--- a/ui/views/animation/ink_drop_host_view.h
+++ b/ui/views/animation/ink_drop_host_view.h
@@ -37,7 +37,6 @@ 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
@@ -47,7 +46,12 @@ class VIEWS_EXPORT InkDropHostView : public View, public InkDropHost {
ON,
ON_NO_GESTURE_HANDLER,
};
+ // Toggle to enable/disable an InkDrop on this View. Descendants can override
+ // CreateInkDropHighlight() and CreateInkDropRipple() to change thelook/feel
+ // of the InkDrop.
+ void SetInkDropMode(InkDropMode ink_drop_mode);
+ protected:
static const int kInkDropSmallCornerRadius;
void set_ink_drop_visible_opacity(float visible_opacity) {
@@ -91,11 +95,6 @@ class VIEWS_EXPORT InkDropHostView : public View, public InkDropHost {
InkDrop* ink_drop() { return ink_drop_.get(); }
- // Toggle to enable/disable an InkDrop on this View. Descendants can override
- // CreateInkDropHighlight() and CreateInkDropRipple() to change the look/feel
- // of the InkDrop.
- void SetInkDropMode(InkDropMode ink_drop_mode);
-
private:
class InkDropGestureHandler;
friend class InkDropGestureHandler;
« no previous file with comments | « no previous file | ui/views/animation/ink_drop_host_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698