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

Side by Side Diff: ash/system/chromeos/network/network_icon_animation.h

Issue 23531053: ui/base/animation -> ui/gfx/animation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge 2 trunk Created 7 years, 3 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 | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_ 5 #ifndef ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_
6 #define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_ 6 #define ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
11 #include "ash/ash_export.h" 11 #include "ash/ash_export.h"
12 #include "base/observer_list.h" 12 #include "base/observer_list.h"
13 #include "ui/base/animation/animation_delegate.h" 13 #include "ui/gfx/animation/animation_delegate.h"
14 #include "ui/base/animation/throb_animation.h" 14 #include "ui/gfx/animation/throb_animation.h"
15 15
16 namespace ash { 16 namespace ash {
17 namespace network_icon { 17 namespace network_icon {
18 18
19 class AnimationObserver; 19 class AnimationObserver;
20 20
21 // Single instance class to handle icon animations and keep them in sync. 21 // Single instance class to handle icon animations and keep them in sync.
22 class ASH_EXPORT NetworkIconAnimation : public ui::AnimationDelegate { 22 class ASH_EXPORT NetworkIconAnimation : public gfx::AnimationDelegate {
23 public: 23 public:
24 NetworkIconAnimation(); 24 NetworkIconAnimation();
25 virtual ~NetworkIconAnimation(); 25 virtual ~NetworkIconAnimation();
26 26
27 // Returns the current animation value, [0-1]. 27 // Returns the current animation value, [0-1].
28 double GetAnimation(); 28 double GetAnimation();
29 29
30 // The animation stops when all observers have been removed. 30 // The animation stops when all observers have been removed.
31 // Be sure to remove observers when no associated icons are animating. 31 // Be sure to remove observers when no associated icons are animating.
32 void AddObserver(AnimationObserver* observer); 32 void AddObserver(AnimationObserver* observer);
33 void RemoveObserver(AnimationObserver* observer); 33 void RemoveObserver(AnimationObserver* observer);
34 34
35 // ui::AnimationDelegate implementation. 35 // gfx::AnimationDelegate implementation.
36 virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE; 36 virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
37 37
38 static NetworkIconAnimation* GetInstance(); 38 static NetworkIconAnimation* GetInstance();
39 39
40 private: 40 private:
41 ui::ThrobAnimation animation_; 41 gfx::ThrobAnimation animation_;
42 ObserverList<AnimationObserver> observers_; 42 ObserverList<AnimationObserver> observers_;
43 }; 43 };
44 44
45 } // namespace network_icon 45 } // namespace network_icon
46 } // namespace ash 46 } // namespace ash
47 47
48 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_ 48 #endif // ASH_SYSTEM_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_
OLDNEW
« no previous file with comments | « ash/shelf/shelf_layout_manager_unittest.cc ('k') | ash/system/chromeos/network/network_icon_animation.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698