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

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

Issue 1373983002: Enhanced the InkDropRippleImpl to create/destroy InkDropAnimations as needed. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed merge with master. Created 5 years, 2 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_unittest.cc ('k') | ui/views/animation/ink_drop_state.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/animation/ink_drop_state.h
diff --git a/ui/views/animation/ink_drop_state.h b/ui/views/animation/ink_drop_state.h
index 2e8cd8676b09d7761bfa7160cda771b00058a6c9..7af5229ee9d9786bc9407c33f6793240fc56fdf2 100644
--- a/ui/views/animation/ink_drop_state.h
+++ b/ui/views/animation/ink_drop_state.h
@@ -5,6 +5,11 @@
#ifndef UI_VIEWS_ANIMATION_INK_DROP_STATE_H_
#define UI_VIEWS_ANIMATION_INK_DROP_STATE_H_
+#include <iosfwd>
+#include <string>
+
+#include "ui/views/views_export.h"
+
namespace views {
// The different states that the ink drop animation can be animated to.
@@ -14,23 +19,26 @@ enum class InkDropState {
// 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
+ // The quick action for the view has been triggered. e.g. a tap gesture to
// click a button.
QUICK_ACTION,
// A view is being interacted with and the pending action will be a 'slow'
- // action. e.g. A long press that is still active before releasing.
+ // action. e.g. a long press that is still active before releasing.
SLOW_ACTION_PENDING,
- // The slow action for the view has been triggered. e.g. A long press release
+ // The slow action for the view has been triggered. e.g. a long press release
// to bring up a menu.
SLOW_ACTION,
// An active state for a view that is not currently being interacted with.
- // e.g. A pressed button that is showing a menu.
+ // e.g. a pressed button that is showing a menu.
ACTIVATED,
- // A previously active state has been toggled to inactive. e.g. A drop down
+ // A previously active state has been toggled to inactive. e.g. a drop down
// menu is closed.
DEACTIVATED,
};
+// Returns a human readable string for |state|. Useful for logging.
+std::string ToString(InkDropState state);
+
} // namespace views
#endif // UI_VIEWS_ANIMATION_INK_DROP_STATE_H_
« no previous file with comments | « ui/views/animation/ink_drop_animation_unittest.cc ('k') | ui/views/animation/ink_drop_state.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698