| Index: ui/views/animation/ink_drop_highlight_observer.h
|
| diff --git a/ui/views/animation/ink_drop_hover_observer.h b/ui/views/animation/ink_drop_highlight_observer.h
|
| similarity index 56%
|
| rename from ui/views/animation/ink_drop_hover_observer.h
|
| rename to ui/views/animation/ink_drop_highlight_observer.h
|
| index 4e31bc7a42868c2891e1e9c3ce227f0c6292f107..eb98bd7340dc85598267b1f6af5c9ae460792c12 100644
|
| --- a/ui/views/animation/ink_drop_hover_observer.h
|
| +++ b/ui/views/animation/ink_drop_highlight_observer.h
|
| @@ -2,40 +2,41 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef UI_VIEWS_ANIMATION_INK_DROP_HOVER_OBSERVER_H_
|
| -#define UI_VIEWS_ANIMATION_INK_DROP_HOVER_OBSERVER_H_
|
| +#ifndef UI_VIEWS_ANIMATION_INK_DROP_HIGHLIGHT_OBSERVER_H_
|
| +#define UI_VIEWS_ANIMATION_INK_DROP_HIGHLIGHT_OBSERVER_H_
|
|
|
| #include <string>
|
|
|
| #include "base/macros.h"
|
| #include "ui/views/animation/ink_drop_animation_ended_reason.h"
|
| -#include "ui/views/animation/ink_drop_hover.h"
|
| +#include "ui/views/animation/ink_drop_highlight.h"
|
| #include "ui/views/views_export.h"
|
|
|
| namespace views {
|
|
|
| -// Observer to attach to an InkDropHover animation.
|
| -class VIEWS_EXPORT InkDropHoverObserver {
|
| +// Observer to attach to an InkDropHighlight animation.
|
| +class VIEWS_EXPORT InkDropHighlightObserver {
|
| public:
|
| // An animation for the given |animation_type| has started.
|
| - virtual void AnimationStarted(InkDropHover::AnimationType animation_type) = 0;
|
| + virtual void AnimationStarted(
|
| + InkDropHighlight::AnimationType animation_type) = 0;
|
|
|
| // Notifies the observer that an animation for the given |animation_type| has
|
| // finished and the reason for completion is given by |reason|. If |reason| is
|
| // SUCCESS then the animation has progressed to its final frame however if
|
| // |reason| is |PRE_EMPTED| then the animation was stopped before its final
|
| // frame.
|
| - virtual void AnimationEnded(InkDropHover::AnimationType animation_type,
|
| + virtual void AnimationEnded(InkDropHighlight::AnimationType animation_type,
|
| InkDropAnimationEndedReason reason) = 0;
|
|
|
| protected:
|
| - InkDropHoverObserver() = default;
|
| - virtual ~InkDropHoverObserver() = default;
|
| + InkDropHighlightObserver() = default;
|
| + virtual ~InkDropHighlightObserver() = default;
|
|
|
| private:
|
| - DISALLOW_COPY_AND_ASSIGN(InkDropHoverObserver);
|
| + DISALLOW_COPY_AND_ASSIGN(InkDropHighlightObserver);
|
| };
|
|
|
| } // namespace views
|
|
|
| -#endif // UI_VIEWS_ANIMATION_INK_DROP_HOVER_OBSERVER_H_
|
| +#endif // UI_VIEWS_ANIMATION_INK_DROP_HIGHLIGHT_OBSERVER_H_
|
|
|