Use ash NetworkIconAnimation in NetworkMenuIcon code

chrome/browser/chromeos/status/network_menu_icon.h

 // 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.
 
 #ifndef CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_ICON_H_
 #define CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_ICON_H_
 
 // NetworkMenuIcon Manages an icon that reflects the current state of the
 // network (see chromeos::NetworkLibrary). It takes an optional Delegate
 // argument in the constructor that signals the delegate when the icon changes.
@@ skipping 15 matching lines @@
 // Example usage:
 //   Network* network = network_library->FindNetworkByPath(my_network_path_);
 //   SetIcon(NetworkMenuIcon::GetBitmap(network);
 //
 // This class is not explicitly thread-safe and functions are expected to be
 // called from the UI thread.
 
 #include <map>
 #include <string>
 
+#include "ash/system/chromeos/network/network_icon_animation_observer.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
 #include "chrome/browser/chromeos/cros/network_library.h"
-#include "ui/base/animation/animation_delegate.h"
-#include "ui/base/animation/throb_animation.h"
 #include "ui/gfx/image/image_skia.h"
 
 namespace chromeos {
 
 class NetworkIcon;
 
-class NetworkMenuIcon : public ui::AnimationDelegate {
+class NetworkMenuIcon : public ash::network_icon::AnimationObserver {
  public:
   enum Mode {
     MENU_MODE,      // Prioritizes connecting networks and sets tooltips.
     DROPDOWN_MODE,  // Prioritizes connected networks and sets display text.
   };
 
   enum ResourceColorTheme {
     COLOR_DARK,
     COLOR_LIGHT,
   };
@@ skipping 26 matching lines @@
 
   // Returns true if the icon should be visible in a system tray.
   bool ShouldShowIconInTray();
 
   // Generates and returns the icon image. If |text| is not NULL, sets it to
   // the tooltip or display text to show, based on the value of mode_.
   const gfx::ImageSkia GetIconAndText(string16* text);
   // Generates and returns the icon image for vpn network connection.
   const gfx::ImageSkia GetVpnIconAndText(string16* text);
 
-
-  // ui::AnimationDelegate implementation.
-  virtual void AnimationProgressed(const ui::Animation* animation) OVERRIDE;
+  // ash::network_icon::AnimationObserver implementation.
+  virtual void NetworkIconChanged() OVERRIDE;
 
   // Static functions for generating network icon images:
 
   // Composites the images to generate a network icon. Input parameters are
   // the icon and badges that are composited to generate |result|. Public
   // primarily for unit tests.
   static const gfx::ImageSkia GenerateImageFromComponents(
       const gfx::ImageSkia& icon,
       const gfx::ImageSkia* top_left_badge,
       const gfx::ImageSkia* top_right_badge,
@@ skipping 28 matching lines @@
 
   // Returns total number of images for given type.
   static int NumImages(ImageType type);
 
  protected:
   // Starts the connection animation if necessary and returns its current value.
   // Virtual so that unit tests can override this.
   virtual double GetAnimation();
 
  private:
+  // Returns the index for a connecting icon.
+  int GetConnectingIndex();
   // Returns the appropriate connecting network if any.
   const Network* GetConnectingNetwork();
   // Sets the icon based on the state of the network and the network library.
   // Sets text_ to the appropriate tooltip or display text.
-  void SetIconAndText();
+  // Returns true if the icon should animate.
+  bool SetIconAndText();
   // Sets the icon and text for VPN connection.
-  void SetVpnIconAndText();
+  // Returns true if the icon should animate.
+  bool SetVpnIconAndText();
   // Set the icon and text to show a warning if unable to load the cros library.
   void SetWarningIconAndText();
   // Sets the icon and text when displaying a connecting state.
-  void SetConnectingIconAndText();
+  void SetConnectingIconAndText(const Network* connecting_network);
   // Sets the icon and text when connected to |network|.
-  void SetActiveNetworkIconAndText(const Network* network);
+  // Returns true if the icon should animate.
+  bool SetActiveNetworkIconAndText(const Network* network);
   // Sets the icon and text when disconnected.
   void SetDisconnectedIconAndText();
 
   // Specifies whether this icon is for a normal menu or a dropdown menu.
   Mode mode_;
   // A delegate may be specified to receive notifications when this animates.
   Delegate* delegate_;
   // Generated image for connecting to a VPN.
   gfx::ImageSkia vpn_connecting_badge_;
   ResourceColorTheme resource_color_theme_;
-  // Animation throbber for animating the icon while conencting.
-  ui::ThrobAnimation animation_connecting_;
   // The generated icon image.
   scoped_ptr<NetworkIcon> icon_;
   // A weak pointer to the currently connecting network. Used only for
   // comparison purposes; accessing this directly may be invalid.
   const Network* connecting_network_;
+  // Index of current connecting animation.
+  int connecting_index_;
   // The tooltip or display text associated with the menu icon.
   string16 text_;
   // Timer to eliminate noise while initializing cellular.
   base::Time initialize_state_time_;
 
   DISALLOW_COPY_AND_ASSIGN(NetworkMenuIcon);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_NETWORK_MENU_ICON_H_