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

Side by Side Diff: ui/views/animation/test/test_ink_drop_animation_observer.h

Issue 1951593002: Add MD Ink Drop to host only when a ripple/hover is active. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@2704
Patch Set: Replaced unique_ptr with scoped_ptr. Created 4 years, 7 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 2016 The Chromium Authors. All rights reserved. 1 // Copyright 2016 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_TEST_TEST_INK_DROP_ANIMATION_OBSERVER_H_ 5 #ifndef UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_ANIMATION_OBSERVER_H_
6 #define UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_ANIMATION_OBSERVER_H_ 6 #define UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_ANIMATION_OBSERVER_H_
7 7
8 #include "testing/gtest/include/gtest/gtest.h" 8 #include "testing/gtest/include/gtest/gtest.h"
9 #include "ui/views/animation/ink_drop_animation_observer.h" 9 #include "ui/views/animation/ink_drop_animation_observer.h"
10 #include "ui/views/animation/ink_drop_state.h" 10 #include "ui/views/animation/ink_drop_state.h"
(...skipping 25 matching lines...) Expand all
36 InkDropState target_state_at_last_animation_ended() const { 36 InkDropState target_state_at_last_animation_ended() const {
37 return target_state_at_last_animation_ended_; 37 return target_state_at_last_animation_ended_;
38 } 38 }
39 39
40 // InkDropAnimationObserver: 40 // InkDropAnimationObserver:
41 void AnimationStarted(InkDropState ink_drop_state) override; 41 void AnimationStarted(InkDropState ink_drop_state) override;
42 void AnimationEnded(InkDropState ink_drop_state, 42 void AnimationEnded(InkDropState ink_drop_state,
43 InkDropAnimationEndedReason reason) override; 43 InkDropAnimationEndedReason reason) override;
44 44
45 private: 45 private:
46 // The type as this inherits from. Reduces verbosity in .cc file. 46 // The type this inherits from. Reduces verbosity in .cc file.
47 using ObserverHelper = TestInkDropAnimationObserverHelper<InkDropState>; 47 using ObserverHelper = TestInkDropAnimationObserverHelper<InkDropState>;
48 48
49 // The value of InkDropAnimation::GetTargetInkDropState() the last time an 49 // The value of InkDropAnimation::GetTargetInkDropState() the last time an
50 // InkDropAnimationStarted() event was handled. This is only valid if 50 // InkDropAnimationStarted() event was handled. This is only valid if
51 // |ink_drop_animation_| is not null. 51 // |ink_drop_animation_| is not null.
52 InkDropState target_state_at_last_animation_started_; 52 InkDropState target_state_at_last_animation_started_;
53 53
54 // The value of InkDropAnimation::GetTargetInkDropState() the last time an 54 // The value of InkDropAnimation::GetTargetInkDropState() the last time an
55 // AnimationEnded() event was handled. This is only valid if 55 // AnimationEnded() event was handled. This is only valid if
56 // |ink_drop_animation_| is not null. 56 // |ink_drop_animation_| is not null.
57 InkDropState target_state_at_last_animation_ended_; 57 InkDropState target_state_at_last_animation_ended_;
58 58
59 // An InkDropAnimation to spy info from when notifications are handled. 59 // An InkDropAnimation to spy info from when notifications are handled.
60 InkDropAnimation* ink_drop_animation_; 60 InkDropAnimation* ink_drop_animation_;
61 61
62 DISALLOW_COPY_AND_ASSIGN(TestInkDropAnimationObserver); 62 DISALLOW_COPY_AND_ASSIGN(TestInkDropAnimationObserver);
63 }; 63 };
64 64
65 } // namespace test 65 } // namespace test
66 } // namespace views 66 } // namespace views
67 67
68 #endif // UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_ANIMATION_OBSERVER_H_ 68 #endif // UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_ANIMATION_OBSERVER_H_
OLDNEW
« no previous file with comments | « ui/views/animation/test/ink_drop_animation_test_api.cc ('k') | ui/views/animation/test/test_ink_drop_hover_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698