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

Unified Diff: ash/common/wm/background_animator.h

Issue 2053113002: Replaced BackgroundAnimator with ShelfBackgroundAnimator. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Merge branch 'master' into animate_shelf_chip_backgrounds Created 4 years, 5 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 | « ash/common/test/material_design_controller_test_api.cc ('k') | ash/common/wm/background_animator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/common/wm/background_animator.h
diff --git a/ash/common/wm/background_animator.h b/ash/common/wm/background_animator.h
index 83a1f8c43df55a49f6156ce22c011566cc14c5e9..9446c9fda90d42a81a2868c5b361a1ba0a6074cf 100644
--- a/ash/common/wm/background_animator.h
+++ b/ash/common/wm/background_animator.h
@@ -18,10 +18,14 @@ enum BackgroundAnimatorChangeType {
BACKGROUND_CHANGE_IMMEDIATE
};
+class BackgroundAnimator;
+
// Delegate is notified any time the background changes.
class ASH_EXPORT BackgroundAnimatorDelegate {
public:
- virtual void UpdateBackground(int alpha) = 0;
+ virtual void UpdateBackground(BackgroundAnimator* animator, int alpha) = 0;
+
+ virtual void BackgroundAnimationEnded(BackgroundAnimator* animator) = 0;
protected:
virtual ~BackgroundAnimatorDelegate() {}
@@ -38,6 +42,9 @@ class ASH_EXPORT BackgroundAnimator : public gfx::AnimationDelegate {
// Sets the transition time in ms.
void SetDuration(int time_in_ms);
+ // Stops the animation. Does nothing if the animation is not running.
+ void Stop();
+
// Sets whether a background is rendered. Initial value is false. If |type|
// is |CHANGE_IMMEDIATE| and an animation is not in progress this notifies
// the delegate immediately (synchronously from this method).
@@ -49,6 +56,7 @@ class ASH_EXPORT BackgroundAnimator : public gfx::AnimationDelegate {
// gfx::AnimationDelegate overrides:
void AnimationProgressed(const gfx::Animation* animation) override;
+ void AnimationEnded(const gfx::Animation* animation) override;
private:
BackgroundAnimatorDelegate* delegate_;
« no previous file with comments | « ash/common/test/material_design_controller_test_api.cc ('k') | ash/common/wm/background_animator.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698