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

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

Issue 2720183002: [Views] Update ink drop for omnibox icons (Closed)
Patch Set: Removed CanProcessEventsWithinSubtree Created 3 years, 7 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 | « ui/views/animation/ink_drop_host_view.h ('k') | ui/views/animation/ink_drop_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..47dd80aa23d9928ba78b7638144e2fe14920cf23 100644
--- a/ui/views/animation/ink_drop_impl.h
+++ b/ui/views/animation/ink_drop_impl.h
@@ -52,10 +52,6 @@ class VIEWS_EXPORT InkDropImpl : public InkDrop,
InkDropImpl(InkDropHost* ink_drop_host, const gfx::Size& host_size);
~InkDropImpl() override;
- void SetShowHighlightOnHover(bool show_highlight_on_hover);
-
- void SetShowHighlightOnFocus(bool show_highlight_on_focus);
-
// Auto highlighting is a mechanism to show/hide the highlight based on the
// visibility of the ripple. See the documentation of the AutoHighlightMode
// for more info on the different modes.
@@ -72,6 +68,9 @@ 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;
+ void SetShowHighlightOnHover(bool show_highlight_on_hover) override;
+ void SetShowHighlightOnFocus(bool show_highlight_on_focus) override;
private:
friend class InkDropImplTest;
@@ -222,10 +221,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,
« no previous file with comments | « ui/views/animation/ink_drop_host_view.h ('k') | ui/views/animation/ink_drop_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698