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

Unified Diff: ash/common/system/chromeos/network/network_icon_animation.cc

Issue 2435903002: Move tray code from ui/chromeos/network/ (Closed)
Patch Set: Rebase Created 4 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 side-by-side diff with in-line comments
Download patch
Index: ash/common/system/chromeos/network/network_icon_animation.cc
diff --git a/ui/chromeos/network/network_icon_animation.cc b/ash/common/system/chromeos/network/network_icon_animation.cc
similarity index 78%
rename from ui/chromeos/network/network_icon_animation.cc
rename to ash/common/system/chromeos/network/network_icon_animation.cc
index 9ed3a473b8361fa23c9c4d7deb3b8d98cd446565..26e67512394a50af84e832d0cec8e8a0003459e5 100644
--- a/ui/chromeos/network/network_icon_animation.cc
+++ b/ash/common/system/chromeos/network/network_icon_animation.cc
@@ -2,26 +2,24 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#include "ui/chromeos/network/network_icon_animation.h"
+#include "ash/common/system/chromeos/network/network_icon_animation.h"
-#include "ui/chromeos/network/network_icon_animation_observer.h"
+#include "ash/common/system/chromeos/network/network_icon_animation_observer.h"
namespace {
const int kThrobDurationMs = 750; // Animation cycle length.
}
-namespace ui {
+namespace ash {
namespace network_icon {
-NetworkIconAnimation::NetworkIconAnimation()
- : animation_(this) {
+NetworkIconAnimation::NetworkIconAnimation() : animation_(this) {
// Set up the animation throbber.
animation_.SetThrobDuration(kThrobDurationMs);
animation_.SetTweenType(gfx::Tween::LINEAR);
}
-NetworkIconAnimation::~NetworkIconAnimation() {
-}
+NetworkIconAnimation::~NetworkIconAnimation() {}
void NetworkIconAnimation::AnimationProgressed(
const gfx::Animation* animation) {
@@ -53,10 +51,9 @@ void NetworkIconAnimation::RemoveObserver(AnimationObserver* observer) {
// static
NetworkIconAnimation* NetworkIconAnimation::GetInstance() {
- static NetworkIconAnimation* s_icon_animation =
- new NetworkIconAnimation();
+ static NetworkIconAnimation* s_icon_animation = new NetworkIconAnimation();
return s_icon_animation;
}
} // namespace network_icon
-} // namespace ui
+} // namespace ash

Powered by Google App Engine
This is Rietveld 408576698