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

Unified Diff: app/throb_animation.h

Issue 6154001: Move animation code to new ui/base/animation directory.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 11 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 | « app/test_animation_delegate.h ('k') | app/throb_animation.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: app/throb_animation.h
===================================================================
--- app/throb_animation.h (revision 70624)
+++ app/throb_animation.h (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
@@ -6,60 +6,8 @@
#define APP_THROB_ANIMATION_H_
#pragma once
-#include "app/slide_animation.h"
+#include "ui/base/animation/throb_animation.h"
-// A subclass of SlideAnimation that can continually slide. All of the Animation
-// methods behave like that of SlideAnimation: transition to the next state.
-// The StartThrobbing method causes the ThrobAnimation to cycle between hidden
-// and shown for a set number of cycles.
-//
-// A ThrobAnimation has two durations: the duration used when behavior like
-// a SlideAnimation, and the duration used when throbbing.
-class ThrobAnimation : public SlideAnimation {
- public:
- explicit ThrobAnimation(AnimationDelegate* target);
- virtual ~ThrobAnimation() {}
+using ui::ThrobAnimation;
- // Starts throbbing. cycles_til_stop gives the number of cycles to do before
- // stopping. A negative value means "throb indefinitely".
- void StartThrobbing(int cycles_til_stop);
-
- // Sets the duration of the slide animation when throbbing.
- void SetThrobDuration(int duration) { throb_duration_ = duration; }
-
- // Overridden to reset to the slide duration.
- virtual void Reset();
- virtual void Show();
- virtual void Hide();
-
- // Overridden to maintain the slide duration.
- virtual void SetSlideDuration(int duration);
-
- // The number of cycles remaining until the animation stops.
- void set_cycles_remaining(int value) { cycles_remaining_ = value; }
- int cycles_remaining() const { return cycles_remaining_; }
-
- protected:
- // Overriden to continually throb (assuming we're throbbing).
- virtual void Step(base::TimeTicks time_now);
-
- private:
- // Resets state such that we behave like SlideAnimation.
- void ResetForSlide();
-
- // Duration of the slide animation.
- int slide_duration_;
-
- // Duration of the slide animation when throbbing.
- int throb_duration_;
-
- // If throbbing, this is the number of cycles left.
- int cycles_remaining_;
-
- // Are we throbbing?
- bool throbbing_;
-
- DISALLOW_COPY_AND_ASSIGN(ThrobAnimation);
-};
-
#endif // APP_THROB_ANIMATION_H_
« no previous file with comments | « app/test_animation_delegate.h ('k') | app/throb_animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698