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

Side by Side Diff: ui/chromeos/network/network_icon_animation.h

Issue 623293004: replace OVERRIDE and FINAL with override and final in ui/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase on master Created 6 years, 2 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
« no previous file with comments | « ui/chromeos/network/network_icon.cc ('k') | ui/chromeos/network/network_list.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 UI_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_ 5 #ifndef UI_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_
6 #define UI_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_ 6 #define UI_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_
7 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 10
(...skipping 15 matching lines...) Expand all
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 // gfx::AnimationDelegate implementation. 35 // gfx::AnimationDelegate implementation.
36 virtual void AnimationProgressed(const gfx::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 gfx::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 ui 46 } // namespace ui
47 47
48 #endif // UI_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_ 48 #endif // UI_CHROMEOS_NETWORK_NETWORK_ICON_ANIMATION_H_
OLDNEW
« no previous file with comments | « ui/chromeos/network/network_icon.cc ('k') | ui/chromeos/network/network_list.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698