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

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

Issue 2720183002: [Views] Update ink drop for omnibox icons (Closed)
Patch Set: Removed the mask Created 3 years, 8 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_impl.h
diff --git a/ui/views/animation/ink_drop_impl.h b/ui/views/animation/ink_drop_impl.h
index 961f80b0cfbd37373bf8bced5f2e82e2b95ade4e..cbf7fe4ca615bc6aabf0161079430bf0d4435932 100644
--- a/ui/views/animation/ink_drop_impl.h
+++ b/ui/views/animation/ink_drop_impl.h
@@ -72,6 +72,7 @@ class VIEWS_EXPORT InkDropImpl : public InkDrop,
void SnapToActivated() override;
void SetHovered(bool is_hovered) override;
void SetFocused(bool is_focused) override;
+ bool IsHighlightFadingInOrVisible() const override;
private:
friend class InkDropImplTest;
@@ -222,10 +223,6 @@ class VIEWS_EXPORT InkDropImpl : public InkDrop,
// or highlight is active.
void RemoveRootLayerFromHostIfNeeded();
- // Returns true if the highlight animation is in the process of fading in or
- // is visible.
- bool IsHighlightFadingInOrVisible() const;
-
// views::InkDropRippleObserver:
void AnimationStarted(InkDropState ink_drop_state) override;
void AnimationEnded(InkDropState ink_drop_state,

Powered by Google App Engine
This is Rietveld 408576698