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

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

Issue 2744463002: Add VectorIconButton functionality to ImageButton. (Closed)
Patch Set: WIP: use observer Created 3 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
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 995e4d5c459f3f55a4531567ae266628b46f48cd..abef9b59813cfed9a60f0b0930f38e411cc625fe 100644
--- a/ui/views/animation/ink_drop_host_view.h
+++ b/ui/views/animation/ink_drop_host_view.h
@@ -71,15 +71,11 @@ class VIEWS_EXPORT InkDropHostView : public View, public InkDropHost {
// Returns the default InkDropRipple centered on |center_point|.
std::unique_ptr<InkDropRipple> CreateDefaultInkDropRipple(
- const gfx::Point& center_point,
- const gfx::Size& size = gfx::Size(kDefaultInkDropSize,
- kDefaultInkDropSize)) const;
+ const gfx::Point& center_point) const;
// Returns the default InkDropHighlight centered on |center_point|.
std::unique_ptr<InkDropHighlight> CreateDefaultInkDropHighlight(
- const gfx::PointF& center_point,
- const gfx::Size& size = gfx::Size(kDefaultInkDropSize,
- kDefaultInkDropSize)) const;
+ const gfx::PointF& center_point) const;
// Returns the point of the |last_ripple_triggering_event_| if it was a
// LocatedEvent, otherwise the center point of the local bounds is returned.
@@ -122,6 +118,8 @@ class VIEWS_EXPORT InkDropHostView : public View, public InkDropHost {
// of CreateInkDrop() delegates to this function.
std::unique_ptr<InkDropImpl> CreateDefaultInkDropImpl();
+ gfx::Size GetInkDropSize() const;
+
InkDropMode ink_drop_mode() const { return ink_drop_mode_; }
private:

Powered by Google App Engine
This is Rietveld 408576698