Refactors animation to allow for cleaner subclassing. I'm doing this

chrome/browser/chromeos/status/network_menu_button.cc

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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 "chrome/browser/chromeos/status/network_menu_button.h"
 
 #include <limits>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/string_util.h"
@@ skipping 15 matching lines @@
 // static
 const int NetworkMenuButton::kNumWifiImages = 9;
 const int NetworkMenuButton::kThrobDuration = 1000;
 
 NetworkMenuButton::NetworkMenuButton(StatusAreaHost* host)
     : StatusAreaButton(this),
       host_(host),
       ALLOW_THIS_IN_INITIALIZER_LIST(network_menu_(this)),
       ALLOW_THIS_IN_INITIALIZER_LIST(animation_connecting_(this)) {
   animation_connecting_.SetThrobDuration(kThrobDuration);
-  animation_connecting_.SetTweenType(SlideAnimation::NONE);
+  animation_connecting_.SetTweenType(Tween::LINEAR);
   NetworkChanged(CrosLibrary::Get()->GetNetworkLibrary());
   CrosLibrary::Get()->GetNetworkLibrary()->AddObserver(this);
 }
 
 NetworkMenuButton::~NetworkMenuButton() {
   CrosLibrary::Get()->GetNetworkLibrary()->RemoveObserver(this);
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton, menus::MenuModel implementation:
@@ skipping 130 matching lines @@
   }
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton, StatusAreaButton implementation:
 
 void NetworkMenuButton::DrawPressed(gfx::Canvas* canvas) {
   // If ethernet connected and not current connecting, then show ethernet
   // pressed icon. Otherwise, show the bars pressed icon.
   if (CrosLibrary::Get()->GetNetworkLibrary()->ethernet_connected() &&
-      !animation_connecting_.IsAnimating())
+      !animation_connecting_.is_animating())
     canvas->DrawBitmapInt(IconForDisplay(
         *ResourceBundle::GetSharedInstance().
             GetBitmapNamed(IDR_STATUSBAR_NETWORK_WIRED_PRESSED), SkBitmap()),
         0, 0);
   else
     canvas->DrawBitmapInt(IconForDisplay(
         *ResourceBundle::GetSharedInstance().
             GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS_PRESSED), SkBitmap()),
         0, 0);
 }
@@ skipping 24 matching lines @@
         cros->wifi_strength() / 100.0;
     if (value < 0)
       value = 0;
     else if (value > 1)
       value = 1;
 
     // If we are animating network traffic and not connecting, then we need to
     // figure out if we are to also draw the extra image.
     int downloading_index = -1;
     int uploading_index = -1;
-    if (!animation_connecting_.IsAnimating()) {
+    if (!animation_connecting_.is_animating()) {
       // For network animation, we only show animation in one direction.
       // So when we are hiding, we just use 1 minus the value.
       // We have kNumWifiImages + 1 number of states. For the first state, where
       // we are not adding any images, we set the index to -1.
-      if (animation_downloading_.IsAnimating()) {
+      if (animation_downloading_.is_animating()) {
         double value_downloading = animation_downloading_.IsShowing() ?
             animation_downloading_.GetCurrentValue() :
             1.0 - animation_downloading_.GetCurrentValue();
         downloading_index = static_cast<int>(value_downloading *
               nextafter(static_cast<float>(kNumWifiImages + 1), 0)) - 1;
       }
-      if (animation_uploading_.IsAnimating()) {
+      if (animation_uploading_.is_animating()) {
         double value_uploading = animation_uploading_.IsShowing() ?
             animation_uploading_.GetCurrentValue() :
             1.0 - animation_uploading_.GetCurrentValue();
         uploading_index = static_cast<int>(value_uploading *
               nextafter(static_cast<float>(kNumWifiImages + 1), 0)) - 1;
       }
     }
 
     // We need to determine opacity for each of the kNumWifiImages images.
     // We split the range (0-1) into equal ranges per kNumWifiImages images.
@@ skipping 36 matching lines @@
 }
 */
 ////////////////////////////////////////////////////////////////////////////////
 // NetworkMenuButton, NetworkLibrary::Observer implementation:
 
 void NetworkMenuButton::NetworkChanged(NetworkLibrary* cros) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   if (CrosLibrary::Get()->EnsureLoaded()) {
     if (cros->wifi_connecting() || cros->cellular_connecting()) {
       // Start the connecting animation if not running.
-      if (!animation_connecting_.IsAnimating()) {
+      if (!animation_connecting_.is_animating()) {
         animation_connecting_.Reset();
         animation_connecting_.StartThrobbing(std::numeric_limits<int>::max());
         SetIcon(*rb.GetBitmapNamed(IDR_STATUSBAR_NETWORK_BARS1));
       }
     } else {
       // Stop connecting animation since we are not connecting.
       animation_connecting_.Stop();
 
       // Always show the higher priority connection first. Ethernet then wifi.
       if (cros->ethernet_connected())
@@ skipping 198 matching lines @@
     if (host_->ShouldOpenButtonOptions(this)) {
       label =
           l10n_util::GetStringUTF16(IDS_STATUSBAR_NETWORK_OPEN_OPTIONS_DIALOG);
       menu_items_.push_back(MenuItem(menus::MenuModel::TYPE_COMMAND, label,
           SkBitmap(), WifiNetwork(), CellularNetwork(), FLAG_OPTIONS));
     }
   }
 }
 
 }  // namespace chromeos