Use ash NetworkIconAnimation in NetworkMenuIcon code

ash/system/chromeos/network/network_icon.cc

 // Copyright (c) 2012 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.
 
 #include "ash/system/chromeos/network/network_icon.h"
 
 #include "ash/shell.h"
+#include "ash/system/chromeos/network/network_icon_animation.h"
 #include "ash/system/chromeos/network/network_icon_animation_observer.h"
-#include "base/observer_list.h"
 #include "chromeos/network/device_state.h"
 #include "chromeos/network/network_state.h"
 #include "chromeos/network/network_state_handler.h"
 #include "grit/ash_resources.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/base/animation/throb_animation.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia_operations.h"
 #include "ui/gfx/image/image_skia_source.h"
 #include "ui/gfx/rect.h"
 #include "ui/gfx/size_conversions.h"
 
 using chromeos::DeviceState;
 using chromeos::NetworkStateHandler;
 using chromeos::NetworkState;
@@ skipping 85 matching lines @@
         top_right(NULL),
         bottom_left(NULL),
         bottom_right(NULL) {
   }
   const gfx::ImageSkia* top_left;
   const gfx::ImageSkia* top_right;
   const gfx::ImageSkia* bottom_left;
   const gfx::ImageSkia* bottom_right;
 };
 
-// Animation cycle length.
-const int kThrobDurationMs = 750;
-
 // Amount to fade icons while connecting.
 const double kConnectingImageAlpha = 0.5;
 
 // Images for strength bars for wired networks.
 const int kNumBarsImages = 5;
 gfx::ImageSkia* kBarsImagesAnimatingDark[kNumBarsImages - 1];
 gfx::ImageSkia* kBarsImagesAnimatingLight[kNumBarsImages - 1];
 
 // Imagaes for strength arcs for wireless networks.
 const int kNumArcsImages = 5;
@@ skipping 259 matching lines @@
             IDR_AURA_UBER_TRAY_NETWORK_ROAMING_LIGHT);
       }
     }
     if (!network->IsConnectingState()) {
       badges->top_left = BadgeForNetworkTechnology(network, color);
     }
   }
 }
 
 //------------------------------------------------------------------------------
-// Handle connecting images
-
-class ConnectingAnimation : public ui::AnimationDelegate {
- public:
-  ConnectingAnimation()
-      : ALLOW_THIS_IN_INITIALIZER_LIST(animation_(this)) {
-    // Set up the animation throbber.
-    animation_.SetThrobDuration(kThrobDurationMs);
-    animation_.SetTweenType(ui::Tween::LINEAR);
-  }
-
-  virtual ~ConnectingAnimation() {}
-
-  // ui::AnimationDelegate implementation.
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE {
-    if (animation == &animation_) {
-      FOR_EACH_OBSERVER(AnimationObserver, observers_, NetworkIconChanged());
-    }
-  }
-
-  double GetAnimation() {
-    if (!animation_.is_animating()) {
-      animation_.Reset();
-      animation_.StartThrobbing(-1 /*throb indefinitely*/);
-      return 0;
-    }
-    return animation_.GetCurrentValue();
-  }
-
-  void AddObserver(AnimationObserver* observer) {
-    observers_.AddObserver(observer);
-  }
-
-  void RemoveObserver(AnimationObserver* observer) {
-    observers_.RemoveObserver(observer);
-    if (observers_.size() == 0)
-      animation_.Stop();
-  }
-
- private:
-  ui::ThrobAnimation animation_;
-  ObserverList<AnimationObserver> observers_;
-};
-
-ConnectingAnimation* GetConnectingAnimation() {
-  static ConnectingAnimation* s_connecting_animation =
-      new ConnectingAnimation();
-  return s_connecting_animation;
-}
+// Get connecting images
 
 gfx::ImageSkia GetConnectingImage(const std::string& type,
                                   ResourceColorTheme color) {
   ImageType image_type = (type == flimflam::kTypeWifi) ? ARCS : BARS;
   int image_count = NumImagesForType(image_type) - 1;
   gfx::ImageSkia** images = ImageListForType(image_type, color);
-  double animation = GetConnectingAnimation()->GetAnimation();
+  double animation = NetworkIconAnimation::GetInstance()->GetAnimation();
   int index = animation * nextafter(static_cast<float>(image_count), 0);
   index = std::max(std::min(index, image_count - 1), 0);
 
   // Lazily cache images.
   if (!images[index]) {
     gfx::ImageSkia source = GetImageForIndex(image_type, color, index + 1);
     images[index] = new gfx::ImageSkia(
         gfx::ImageSkiaOperations::CreateBlendedImage(
             gfx::ImageSkia(new EmptyImageSource(source.size()), source.size()),
             source,
@@ skipping 76 matching lines @@
 }
 
 //------------------------------------------------------------------------------
 // Public interface
 
 gfx::ImageSkia GetImageForNetwork(const NetworkState* network,
                                   ResourceColorTheme color,
                                   AnimationObserver* observer) {
   if (network->IsConnectingState()) {
     if (observer)
-      GetConnectingAnimation()->AddObserver(observer);
+      NetworkIconAnimation::GetInstance()->AddObserver(observer);
     return GetConnectingImage(network->type(), color);
   }
   // Not connecting, remove observer.
   if (observer)
-    GetConnectingAnimation()->RemoveObserver(observer);
+    NetworkIconAnimation::GetInstance()->RemoveObserver(observer);
 
   NetworkIconMap* icon_map = GetIconMap(color);
 
   // Find or add the icon.
   NetworkIconImpl* icon;
   NetworkIconMap::iterator iter = icon_map->find(network->path());
   if (iter == icon_map->end()) {
     icon = new NetworkIconImpl(network->path(), color);
     icon_map->insert(std::make_pair(network->path(), icon));
   } else {
     icon = iter->second;
   }
 
   // Update and return the icon's image.
   icon->Update(network);
   return icon->image();
 }
 
 }  // namespace network_icon
 }  // namespace ash