| Index: ui/views/animation/test/test_ink_drop_animation_observer.h
|
| diff --git a/ui/views/animation/test/test_ink_drop_animation_observer.h b/ui/views/animation/test/test_ink_drop_animation_observer.h
|
| deleted file mode 100644
|
| index 12c1d19610164c6b8da70346654288ead9af5bb2..0000000000000000000000000000000000000000
|
| --- a/ui/views/animation/test/test_ink_drop_animation_observer.h
|
| +++ /dev/null
|
| @@ -1,68 +0,0 @@
|
| -// Copyright 2016 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#ifndef UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_ANIMATION_OBSERVER_H_
|
| -#define UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_ANIMATION_OBSERVER_H_
|
| -
|
| -#include "testing/gtest/include/gtest/gtest.h"
|
| -#include "ui/views/animation/ink_drop_animation_observer.h"
|
| -#include "ui/views/animation/ink_drop_state.h"
|
| -#include "ui/views/animation/test/test_ink_drop_animation_observer_helper.h"
|
| -
|
| -namespace views {
|
| -class InkDropAnimation;
|
| -
|
| -namespace test {
|
| -
|
| -// Simple InkDropAnimationObserver test double that tracks if
|
| -// InkDropAnimationObserver methods are invoked and the parameters used for the
|
| -// last invocation.
|
| -class TestInkDropAnimationObserver
|
| - : public InkDropAnimationObserver,
|
| - public TestInkDropAnimationObserverHelper<InkDropState> {
|
| - public:
|
| - TestInkDropAnimationObserver();
|
| - ~TestInkDropAnimationObserver() override;
|
| -
|
| - void set_ink_drop_animation(InkDropAnimation* ink_drop_animation) {
|
| - ink_drop_animation_ = ink_drop_animation;
|
| - }
|
| -
|
| - InkDropState target_state_at_last_animation_started() const {
|
| - return target_state_at_last_animation_started_;
|
| - }
|
| -
|
| - InkDropState target_state_at_last_animation_ended() const {
|
| - return target_state_at_last_animation_ended_;
|
| - }
|
| -
|
| - // InkDropAnimationObserver:
|
| - void AnimationStarted(InkDropState ink_drop_state) override;
|
| - void AnimationEnded(InkDropState ink_drop_state,
|
| - InkDropAnimationEndedReason reason) override;
|
| -
|
| - private:
|
| - // The type this inherits from. Reduces verbosity in .cc file.
|
| - using ObserverHelper = TestInkDropAnimationObserverHelper<InkDropState>;
|
| -
|
| - // The value of InkDropAnimation::GetTargetInkDropState() the last time an
|
| - // InkDropAnimationStarted() event was handled. This is only valid if
|
| - // |ink_drop_animation_| is not null.
|
| - InkDropState target_state_at_last_animation_started_;
|
| -
|
| - // The value of InkDropAnimation::GetTargetInkDropState() the last time an
|
| - // AnimationEnded() event was handled. This is only valid if
|
| - // |ink_drop_animation_| is not null.
|
| - InkDropState target_state_at_last_animation_ended_;
|
| -
|
| - // An InkDropAnimation to spy info from when notifications are handled.
|
| - InkDropAnimation* ink_drop_animation_;
|
| -
|
| - DISALLOW_COPY_AND_ASSIGN(TestInkDropAnimationObserver);
|
| -};
|
| -
|
| -} // namespace test
|
| -} // namespace views
|
| -
|
| -#endif // UI_VIEWS_ANIMATION_TEST_TEST_INK_DROP_ANIMATION_OBSERVER_H_
|
|
|