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

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

Issue 2720183002: [Views] Update ink drop for omnibox icons (Closed)
Patch Set: Rebased and fixed tests 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.h
diff --git a/ui/views/animation/ink_drop.h b/ui/views/animation/ink_drop.h
index 0eb419e11105867f8c25447dee516146f55fd213..9980bb0ceea09e317699943c179d158949e8669a 100644
--- a/ui/views/animation/ink_drop.h
+++ b/ui/views/animation/ink_drop.h
@@ -13,6 +13,7 @@
#include "ui/events/event_handler.h"
#include "ui/gfx/geometry/rect.h"
#include "ui/gfx/geometry/size.h"
+#include "ui/views/animation/ink_drop_observer.h"
bruthig 2017/03/22 17:20:16 Can this be forward declared instead?
spqchan 2017/03/24 17:58:03 Done.
#include "ui/views/animation/ink_drop_state.h"
#include "ui/views/view.h"
#include "ui/views/views_export.h"
@@ -46,8 +47,17 @@ class VIEWS_EXPORT InkDrop {
// Enables or disables the focus state.
virtual void SetFocused(bool is_focused) = 0;
+ // Returns true if the highlight animation is in the process of fading in or
+ // is visible.
+ virtual bool IsHighlightFadingInOrVisible() const = 0;
+
+ // Sets the observer of this object.
+ void SetObserver(InkDropObserver* observer);
bruthig 2017/03/22 17:20:16 I'd prefer if this used the Add/RemoveObserver() c
spqchan 2017/03/24 17:58:03 Done.
+
protected:
- InkDrop() {}
+ InkDrop() : observer_(nullptr) {}
+
+ InkDropObserver* observer_;
private:
DISALLOW_COPY_AND_ASSIGN(InkDrop);

Powered by Google App Engine
This is Rietveld 408576698