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

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

Issue 1390113006: Added material design mouse hover feedback support. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed the *InkDropControllerFactory* tests to work with the hover timer. 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
Index: ui/views/animation/ink_drop_animation_controller_factory.h
diff --git a/ui/views/animation/ink_drop_animation_controller_factory.h b/ui/views/animation/ink_drop_animation_controller_factory.h
index 839631460f713440026dc5012f2d08d6bb891526..168ec67b4571572225a248537b5b4843e4f7ffe7 100644
--- a/ui/views/animation/ink_drop_animation_controller_factory.h
+++ b/ui/views/animation/ink_drop_animation_controller_factory.h
@@ -11,6 +11,7 @@
namespace views {
class InkDropAnimationController;
+class InkDropConsumer;
class InkDropHost;
// A factory to create InkDropAnimationController. A different
@@ -22,7 +23,8 @@ class VIEWS_EXPORT InkDropAnimationControllerFactory {
// InkDropAnimation's ui::Layer to/from the |ink_drop_host| when the animation
// is active/inactive.
static scoped_ptr<InkDropAnimationController>
- CreateInkDropAnimationController(InkDropHost* ink_drop_host);
+ CreateInkDropAnimationController(InkDropHost* ink_drop_host,
+ InkDropConsumer* ink_drop_consumer);
private:
InkDropAnimationControllerFactory();

Powered by Google App Engine
This is Rietveld 408576698