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

Side by Side 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: Based diff delta on dependant branch. 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 unified diff | Download patch
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_VIEWS_ANIMATION_INK_DROP_STATE_H_ 5 #ifndef UI_VIEWS_ANIMATION_INK_DROP_STATE_H_
6 #define UI_VIEWS_ANIMATION_INK_DROP_STATE_H_ 6 #define UI_VIEWS_ANIMATION_INK_DROP_STATE_H_
7 7
8 #include <iosfwd>
9
10 #include "ui/views/views_export.h"
11
8 namespace views { 12 namespace views {
9 13
10 // The different states that the ink drop animation can be animated to. 14 // The different states that the ink drop animation can be animated to.
11 enum class InkDropState { 15 enum class InkDropState {
12 // The ink drop is not visible. 16 // The ink drop is not visible.
13 HIDDEN, 17 HIDDEN,
14 // The view is being interacted with but the action to be triggered has not 18 // The view is being interacted with but the action to be triggered has not
15 // yet been determined. 19 // yet been determined.
16 ACTION_PENDING, 20 ACTION_PENDING,
17 // The quick action for the view has been triggered. e.g. A tap gesture to 21 // The quick action for the view has been triggered. e.g. A tap gesture to
varkha 2015/10/06 20:58:38 nit: here and below s/. e.g. A tap/, e.g. a tap.
bruthig 2015/10/08 21:42:55 Done.
18 // click a button. 22 // click a button.
19 QUICK_ACTION, 23 QUICK_ACTION,
20 // A view is being interacted with and the pending action will be a 'slow' 24 // A view is being interacted with and the pending action will be a 'slow'
21 // action. e.g. A long press that is still active before releasing. 25 // action. e.g. A long press that is still active before releasing.
22 SLOW_ACTION_PENDING, 26 SLOW_ACTION_PENDING,
23 // The slow action for the view has been triggered. e.g. A long press release 27 // The slow action for the view has been triggered. e.g. A long press release
24 // to bring up a menu. 28 // to bring up a menu.
25 SLOW_ACTION, 29 SLOW_ACTION,
26 // An active state for a view that is not currently being interacted with. 30 // An active state for a view that is not currently being interacted with.
27 // e.g. A pressed button that is showing a menu. 31 // e.g. A pressed button that is showing a menu.
28 ACTIVATED, 32 ACTIVATED,
29 // A previously active state has been toggled to inactive. e.g. A drop down 33 // A previously active state has been toggled to inactive. e.g. A drop down
30 // menu is closed. 34 // menu is closed.
31 DEACTIVATED, 35 DEACTIVATED,
32 }; 36 };
33 37
38 VIEWS_EXPORT std::ostream& operator<<(std::ostream& out, InkDropState state);
39
sadrul 2015/10/08 01:06:01 Same here: is this necessary/useful? We have gener
bruthig 2015/10/08 21:42:55 Replaced with ToString().
34 } // namespace views 40 } // namespace views
35 41
36 #endif // UI_VIEWS_ANIMATION_INK_DROP_STATE_H_ 42 #endif // UI_VIEWS_ANIMATION_INK_DROP_STATE_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698