Merge 180012

chrome/browser/chromeos/status/network_menu_icon.cc

Index: chrome/browser/chromeos/status/network_menu_icon.cc
===================================================================
--- chrome/browser/chromeos/status/network_menu_icon.cc	(revision 180552)
+++ chrome/browser/chromeos/status/network_menu_icon.cc	(working copy)
@@ -9,6 +9,7 @@
 #include <map>
 #include <utility>
 
+#include "ash/system/chromeos/network/network_icon_animation.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/chromeos/accessibility/accessibility_util.h"
 #include "chrome/browser/chromeos/cros/cros_library.h"
@@ -25,6 +26,8 @@
 using std::max;
 using std::min;
 
+using ash::network_icon::NetworkIconAnimation;
+
 namespace chromeos {
 
 namespace {
@@ -32,9 +35,6 @@
 // Amount to fade icons while connecting.
 const double kConnectingImageAlpha = 0.5;
 
-// Animation cycle length.
-const int kThrobDurationMs = 750;
-
 // Images for strength bars for wired networks.
 const int kNumBarsImages = 5;
 gfx::ImageSkia* kBarsImagesAnimatingDark[kNumBarsImages - 1];
@@ -282,6 +282,7 @@
 
   bool ShouldShowInTray() const;
 
+  ConnectionType type() { return type_; }
   void set_type(ConnectionType type) { type_ = type; }
   void set_state(ConnectionState state) { state_ = state; }
   void set_icon(const gfx::ImageSkia& icon) { icon_ = icon; }
@@ -607,12 +608,7 @@
     : mode_(mode),
       delegate_(delegate),
       resource_color_theme_(COLOR_DARK),
-      ALLOW_THIS_IN_INITIALIZER_LIST(animation_connecting_(this)),
-      connecting_network_(NULL) {
-  // Set up the connection animation throbber.
-  animation_connecting_.SetThrobDuration(kThrobDurationMs);
-  animation_connecting_.SetTweenType(ui::Tween::LINEAR);
-
+      connecting_index_(-1) {
   // Initialize the icon.
   icon_.reset(new NetworkIcon(resource_color_theme_));
 }
@@ -637,7 +633,10 @@
 }
 
 const gfx::ImageSkia NetworkMenuIcon::GetIconAndText(string16* text) {
-  SetIconAndText();
+  if (SetIconAndText())
+    NetworkIconAnimation::GetInstance()->AddObserver(this);
+  else
+    NetworkIconAnimation::GetInstance()->RemoveObserver(this);
   if (text)
     *text = text_;
   icon_->GenerateImage();
@@ -645,18 +644,24 @@
 }
 
 const gfx::ImageSkia NetworkMenuIcon::GetVpnIconAndText(string16* text) {
-  SetVpnIconAndText();
+  if (SetVpnIconAndText())
+    NetworkIconAnimation::GetInstance()->AddObserver(this);
+  else
+    NetworkIconAnimation::GetInstance()->RemoveObserver(this);
   if (text)
     *text = text_;
   icon_->GenerateImage();
   return icon_->GetImage();
 }
 
-void NetworkMenuIcon::AnimationProgressed(const ui::Animation* animation) {
-  if (animation == &animation_connecting_ && delegate_) {
-    // Only update the connecting network from here.
-    if (GetConnectingNetwork() == connecting_network_)
-      delegate_->NetworkMenuIconChanged();
+void NetworkMenuIcon::NetworkIconChanged() {
+  if (!delegate_ || !icon_.get())
+    return;
+  // Only send a message when the icon would change.
+  int connecting_index = GetConnectingIndex();
+  if (connecting_index != connecting_index_) {
+    connecting_index_ = connecting_index;
+    delegate_->NetworkMenuIconChanged();
   }
 }
 
@@ -677,20 +682,23 @@
 }
 
 double NetworkMenuIcon::GetAnimation() {
-  if (!animation_connecting_.is_animating()) {
-    animation_connecting_.Reset();
-    animation_connecting_.StartThrobbing(-1 /*throb indefinitely*/);
-    return 0;
-  }
-  return animation_connecting_.GetCurrentValue();
+  return NetworkIconAnimation::GetInstance()->GetAnimation();
 }
 
+int NetworkMenuIcon::GetConnectingIndex() {
+  DCHECK(icon_.get());
+  double animation = GetAnimation();
+  int image_count =
+      (icon_->type() == TYPE_WIFI) ? kNumArcsImages - 1 : kNumBarsImages - 1;
+  int index = animation * nextafter(static_cast<float>(image_count), 0);
+  return std::max(std::min(index, image_count - 1), 0);
+}
+
+
 // TODO(stevenjb): move below SetIconAndText.
-void NetworkMenuIcon::SetConnectingIconAndText() {
-  int image_count;
-  ImageType image_type;
-  gfx::ImageSkia** images;
-
+void NetworkMenuIcon::SetConnectingIconAndText(
+    const Network* connecting_network) {
+  connecting_network_ = connecting_network;
   ConnectionType type;
   ConnectionState state;
   if (connecting_network_) {
@@ -713,19 +721,18 @@
   icon_->set_type(type);
   icon_->set_state(state);
 
+  ImageType image_type;
+  gfx::ImageSkia** images;
   if (type == TYPE_WIFI) {
-    image_count = kNumArcsImages - 1;
     image_type = ARCS;
     images = resource_color_theme_ == COLOR_DARK ? kArcsImagesAnimatingDark :
                                                    kArcsImagesAnimatingLight;
   } else {
-    image_count = kNumBarsImages - 1;
     image_type = BARS;
     images = resource_color_theme_ == COLOR_DARK ? kBarsImagesAnimatingDark :
                                                    kBarsImagesAnimatingLight;
   }
-  int index = GetAnimation() * nextafter(static_cast<float>(image_count), 0);
-  index = std::max(std::min(index, image_count - 1), 0);
+  int index = GetConnectingIndex();
 
   // Lazily cache images.
   if (!images[index]) {
@@ -740,7 +747,7 @@
 }
 
 // Sets up the icon and badges for GenerateBitmap().
-void NetworkMenuIcon::SetIconAndText() {
+bool NetworkMenuIcon::SetIconAndText() {
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   DCHECK(cros);
 
@@ -748,10 +755,10 @@
 
   // If we are connecting to a network and it was user-initiated or we are
   // not connected, display that.
-  connecting_network_ = GetConnectingNetwork();
-  if (connecting_network_) {
-    SetConnectingIconAndText();
-    return;
+  const Network* connecting_network = GetConnectingNetwork();
+  if (connecting_network) {
+    SetConnectingIconAndText(connecting_network);
+    return true;
   }
 
   // If not connecting to a network, show the active or connected network.
@@ -760,16 +767,14 @@
     network = cros->connected_network();
   else
     network = cros->active_nonvirtual_network();
-  if (network) {
-    SetActiveNetworkIconAndText(network);
-    return;
-  }
+  if (network)
+    return SetActiveNetworkIconAndText(network);
 
   // If no connected network, check if we are initializing Cellular.
   if (mode_ != DROPDOWN_MODE && cros->cellular_initializing()) {
     initialize_state_time_ = base::Time::Now();
-    SetConnectingIconAndText();
-    return;
+    SetConnectingIconAndText(NULL);
+    return true;
   }
   // There can be a delay between leaving the Initializing state and when a
   // Cellular device shows up, so keep showing the initializing animation
@@ -777,39 +782,36 @@
   const int kInitializingDelaySeconds = 1;
   base::TimeDelta dtime = base::Time::Now() - initialize_state_time_;
   if (dtime.InSeconds() < kInitializingDelaySeconds) {
-    SetConnectingIconAndText();
-    return;
+    SetConnectingIconAndText(NULL);
+    return true;
   }
 
-  // Not connecting, so stop animation.
-  animation_connecting_.Stop();
-
   // No connecting, connected, or active network.
   SetDisconnectedIconAndText();
+  return false;
 }
 
-void NetworkMenuIcon::SetVpnIconAndText() {
+bool NetworkMenuIcon::SetVpnIconAndText() {
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   DCHECK(cros);
 
   icon_->ClearIconAndBadges();
   const VirtualNetwork* vpn = cros->virtual_network();
   if (!vpn) {
-    NOTREACHED();
+    LOG(WARNING) << "SetVpnIconAndText called with no VPN";
     SetDisconnectedIconAndText();
-    return;
+    return false;
   }
   if (vpn->connecting()) {
-    connecting_network_ = vpn;
-    SetConnectingIconAndText();
-    return;
+    SetConnectingIconAndText(vpn);
+    return true;
   }
 
-  // If not connecting to a network, show the active/connected VPN.
-  SetActiveNetworkIconAndText(vpn);
+  // If not connecting to a VPN, show the active/connected VPN.
+  return SetActiveNetworkIconAndText(vpn);
 }
 
-void NetworkMenuIcon::SetActiveNetworkIconAndText(const Network* network) {
+bool NetworkMenuIcon::SetActiveNetworkIconAndText(const Network* network) {
   NetworkLibrary* cros = CrosLibrary::Get()->GetNetworkLibrary();
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   bool animating = false;
@@ -832,8 +834,6 @@
         GetEmptyImage(vpn_badge->size()), *vpn_badge, animation);
     icon_->set_bottom_left_badge(&vpn_connecting_badge_);
   }
-  if (!animating)
-    animation_connecting_.Stop();
 
   // Set the text to display.
   if (network->type() == TYPE_ETHERNET) {
@@ -854,6 +854,7 @@
       text_ = UTF8ToUTF16(network->name());
     }
   }
+  return animating;
 }
 
 void NetworkMenuIcon::SetDisconnectedIconAndText() {