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

chrome/browser/views/status_bubble_views.cc

 // 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/views/status_bubble_views.h"
 
 #include <algorithm>
 
-#include "app/animation.h"
+#include "app/linear_animation.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/text_elider.h"
 #include "base/i18n/rtl.h"
 #include "base/message_loop.h"
 #include "base/string_util.h"
 #include "chrome/browser/browser_theme_provider.h"
 #include "gfx/canvas.h"
 #include "gfx/point.h"
 #include "googleurl/src/gurl.h"
@@ skipping 41 matching lines @@
 static const int kFramerate = 25;
 
 // How long each expansion step should take.
 static const int kMinExpansionStepDurationMS = 20;
 static const int kMaxExpansionStepDurationMS = 150;
 
 // View -----------------------------------------------------------------------
 // StatusView manages the display of the bubble, applying text changes and
 // fading in or out the bubble as required.
 class StatusBubbleViews::StatusView : public views::Label,
-                                      public Animation,
+                                      public LinearAnimation,
                                       public AnimationDelegate {
  public:
   StatusView(StatusBubble* status_bubble, views::Widget* popup,
              ThemeProvider* theme_provider)
-      : ALLOW_THIS_IN_INITIALIZER_LIST(Animation(kFramerate, this)),
+      : ALLOW_THIS_IN_INITIALIZER_LIST(LinearAnimation(kFramerate, this)),
         stage_(BUBBLE_HIDDEN),
         style_(STYLE_STANDARD),
         ALLOW_THIS_IN_INITIALIZER_LIST(timer_factory_(this)),
         status_bubble_(status_bubble),
         popup_(popup),
         opacity_start_(0),
         opacity_end_(0),
         theme_provider_(theme_provider) {
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     gfx::Font font(rb.GetFont(ResourceBundle::BaseFont));
@@ skipping 216 matching lines @@
   } else if (stage_ == BUBBLE_SHOWING_TIMER) {
     // We hadn't yet begun showing anything when we received a new request
     // for something to show, so we start from scratch.
     ResetTimer();
   }
 }
 
 // Animation functions.
 double StatusBubbleViews::StatusView::GetCurrentOpacity() {
   return opacity_start_ + (opacity_end_ - opacity_start_) *
-         Animation::GetCurrentValue();
+         LinearAnimation::GetCurrentValue();
 }
 
 void StatusBubbleViews::StatusView::SetOpacity(double opacity) {
   popup_->SetOpacity(static_cast<unsigned char>(opacity * 255));
   SchedulePaint();
 }
 
 void StatusBubbleViews::StatusView::AnimateToState(double state) {
   SetOpacity(GetCurrentOpacity());
 }
@@ skipping 134 matching lines @@
                         body_bounds.x(),
                         body_bounds.y(),
                         body_bounds.width(),
                         body_bounds.height());
 }
 
 // StatusViewExpander ---------------------------------------------------------
 // Manages the expansion and contraction of the status bubble as it accommodates
 // URLs too long to fit in the standard bubble. Changes are passed through the
 // StatusView to paint.
-class StatusBubbleViews::StatusViewExpander : public Animation,
+class StatusBubbleViews::StatusViewExpander : public LinearAnimation,
                                               public AnimationDelegate {
  public:
   StatusViewExpander(StatusBubble* status_bubble,
                      StatusView* status_view)
-      : ALLOW_THIS_IN_INITIALIZER_LIST(Animation(kFramerate, this)),
+      : ALLOW_THIS_IN_INITIALIZER_LIST(LinearAnimation(kFramerate, this)),
         status_bubble_(status_bubble),
         status_view_(status_view),
         expansion_start_(0),
         expansion_end_(0) {
   }
 
   // Manage the expansion of the bubble.
   void StartExpansion(std::wstring expanded_text, int current_width,
                       int expansion_end);
 
@@ skipping 39 matching lines @@
   expansion_end_ = expansion_end;
   int min_duration = std::max(kMinExpansionStepDurationMS,
       static_cast<int>(kMaxExpansionStepDurationMS *
           (expansion_end - expansion_start) / 100.0));
   SetDuration(std::min(kMaxExpansionStepDurationMS, min_duration));
   Start();
 }
 
 int StatusBubbleViews::StatusViewExpander::GetCurrentBubbleWidth() {
   return static_cast<int>(expansion_start_ +
-      (expansion_end_ - expansion_start_) * Animation::GetCurrentValue());
+      (expansion_end_ - expansion_start_) * LinearAnimation::GetCurrentValue());
 }
 
 void StatusBubbleViews::StatusViewExpander::SetBubbleWidth(int width) {
   status_bubble_->SetBubbleWidth(width);
   status_view_->SchedulePaint();
 }
 
 // StatusBubble ---------------------------------------------------------------
 
 const int StatusBubbleViews::kShadowThickness = 1;
@@ skipping 298 matching lines @@
 
 void StatusBubbleViews::SetBubbleWidth(int width) {
   size_.set_width(width);
   SetBounds(position_.x(), position_.y(), size_.width(), size_.height());
 }
 
 void StatusBubbleViews::CancelExpandTimer() {
   if (!expand_timer_factory_.empty())
     expand_timer_factory_.RevokeAll();
 }