ui/views/animation/ink_drop_animation_controller_impl.h - Issue 1422593003: Made material design ink drop QUICK_ACTION animation more visible.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 1422593003: Made material design ink drop QUICK_ACTION animation more visible. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Merged in changes to ink drop hover. Created 5 years, 1 month 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

« chrome/browser/ui/views/toolbar/toolbar_button.cc ('K') | « ui/views/animation/ink_drop_animation_controller_factory.cc ('k') | ui/views/animation/ink_drop_animation_controller_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/views/animation/ink_drop_animation_controller_impl.h

diff --git a/ui/views/animation/ink_drop_animation_controller_impl.h b/ui/views/animation/ink_drop_animation_controller_impl.h

index fdd713e6b1ff89ae180c3ea593f3e0273df50ce2..5a3ed5f4f45ea2d7296c51f24c91bd5a75cd65eb 100644

--- a/ui/views/animation/ink_drop_animation_controller_impl.h

+++ b/ui/views/animation/ink_drop_animation_controller_impl.h

@@ -37,6 +37,7 @@ class VIEWS_EXPORT InkDropAnimationControllerImpl

// InkDropAnimationController:

InkDropState GetInkDropState() const override;

void AnimateToState(InkDropState ink_drop_state) override;

+ bool WillAutoAnimateToHidden() const override;

void SetHovered(bool is_hovered) override;

bool IsHovered() const override;

gfx::Size GetInkDropLargeSize() const override;

@@ -122,6 +123,10 @@ class VIEWS_EXPORT InkDropAnimationControllerImpl

// CreateInkDropAnimation().

scoped_ptr<InkDropAnimation> ink_drop_animation_;

+ // Tracks whether the InkDropAnimation can be destroyed when a

+ // InkDropState::HIDDEN animation completes.

+ bool can_destroy_after_hidden_animation_;

// The timer used to delay the hover fade in after an ink drop animation.

scoped_ptr<base::Timer> hover_after_animation_timer_;