ash: Fix launcher icon overlaps with status.

ui/views/animation/bounds_animator.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 "ui/views/animation/bounds_animator.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "ui/base/animation/animation_container.h"
 #include "ui/base/animation/slide_animation.h"
 #include "ui/views/view.h"
 
 // Duration in milliseconds for animations.
-static const int kAnimationDuration = 200;
+static const int kDefaultAnimationDuration = 200;
 
 using ui::Animation;
 using ui::AnimationContainer;
 using ui::SlideAnimation;
 using ui::Tween;
 
 namespace views {
 
 BoundsAnimator::BoundsAnimator(View* parent)
     : parent_(parent),
-      observer_(NULL),
-      container_(new AnimationContainer()) {
+      container_(new AnimationContainer()),
+      animation_duration_ms_(kDefaultAnimationDuration) {
   container_->set_observer(this);
 }
 
 BoundsAnimator::~BoundsAnimator() {
   // Reset the delegate so that we don't attempt to notify our observer from
   // the destructor.
   container_->set_observer(NULL);
 
   // Delete all the animations, but don't remove any child views. We assume the
   // view owns us and is going to be deleted anyway.
@@ skipping 94 matching lines @@
   if (data_.empty())
     return;
 
   while (!data_.empty())
     data_.begin()->second.animation->Stop();
 
   // Invoke AnimationContainerProgressed to force a repaint and notify delegate.
   AnimationContainerProgressed(container_.get());
 }
 
+void BoundsAnimator::SetAnimationDuration(int duration_ms) {
+  animation_duration_ms_ = duration_ms;
+}
+
+void BoundsAnimator::AddObserver(BoundsAnimatorObserver* observer) {
+  observers_.AddObserver(observer);
+}
+
+void BoundsAnimator::RemoveObserver(BoundsAnimatorObserver* observer) {
+  observers_.RemoveObserver(observer);
+}
+
 SlideAnimation* BoundsAnimator::CreateAnimation() {
   SlideAnimation* animation = new SlideAnimation(this);
   animation->SetContainer(container_.get());
-  animation->SetSlideDuration(kAnimationDuration);
+  animation->SetSlideDuration(animation_duration_ms_);
   animation->SetTweenType(Tween::EASE_OUT);
   return animation;
 }
 
 void BoundsAnimator::RemoveFromMaps(View* view) {
   DCHECK(data_.count(view) > 0);
   DCHECK(animation_to_view_.count(data_[view].animation) > 0);
 
   animation_to_view_.erase(data_[view].animation);
   data_.erase(view);
@@ skipping 88 matching lines @@
 void BoundsAnimator::AnimationContainerProgressed(
     AnimationContainer* container) {
   if (!repaint_bounds_.IsEmpty()) {
     // Adjust for rtl.
     repaint_bounds_.set_x(parent_->GetMirroredXWithWidthInView(
         repaint_bounds_.x(), repaint_bounds_.width()));
     parent_->SchedulePaintInRect(repaint_bounds_);
     repaint_bounds_.SetRect(0, 0, 0, 0);
   }
 
-  if (observer_ && !IsAnimating()) {
+  if (!IsAnimating()) {
     // Notify here rather than from AnimationXXX to avoid deleting the animation
     // while the animation is calling us.
-    observer_->OnBoundsAnimatorDone(this);
+    FOR_EACH_OBSERVER(BoundsAnimatorObserver,
+                      observers_,
+                      OnBoundsAnimatorDone(this));
   }
 }
 
 void BoundsAnimator::AnimationContainerEmpty(AnimationContainer* container) {
 }
 
 }  // namespace views