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

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

Issue 1286693004: Extracted InkDropAnimator class from InkDropAnimationController. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge branch 'master' Created 5 years, 4 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_animation.cc ('k') | ui/views/animation/ink_drop_animation_controller_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/ink_drop_animation_controller.h
diff --git a/ui/views/animation/ink_drop_animation_controller.h b/ui/views/animation/ink_drop_animation_controller.h
index 40ca74772d14d6baf096ae725ebba84161d63878..57266822bac045a9f5d86f3bea140b6c4f98bf04 100644
--- a/ui/views/animation/ink_drop_animation_controller.h
+++ b/ui/views/animation/ink_drop_animation_controller.h
@@ -11,6 +11,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_state.h"
#include "ui/views/views_export.h"
namespace ui {
@@ -23,24 +24,6 @@ class InkDropDelegate;
class InkDropHost;
class View;
-// The different states that the ink drop animation can be animated to.
-enum class InkDropState {
- // The ink drop is not visible.
- HIDDEN,
- // The view is being interacted with but the action to be triggered has not
- // yet been determined.
- ACTION_PENDING,
- // The quick action for the view has been triggered. e.g. A tap gesture to
- // click a button.
- QUICK_ACTION,
- // The slow action for the view has been triggered. e.g. A long press to bring
- // up a menu.
- SLOW_ACTION,
- // An active state for a view that is no longer being interacted with. e.g. A
- // pressed button that is showing a menu.
- ACTIVATED
-};
-
// Base class for an ink drop animation which is hosted by an InkDropHost.
class VIEWS_EXPORT InkDropAnimationController {
public:
« no previous file with comments | « ui/views/animation/ink_drop_animation.cc ('k') | ui/views/animation/ink_drop_animation_controller_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698