ash: Fix launcher icon overlaps with status.

ui/views/animation/bounds_animator.h

-// 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.
 
 #ifndef UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_
 #define UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_
 #pragma once
 
 #include <map>
 
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
+#include "base/observer_list.h"
 #include "ui/base/animation/animation_container_observer.h"
 #include "ui/base/animation/animation_delegate.h"
 #include "ui/gfx/rect.h"
 #include "ui/views/views_export.h"
 
 namespace ui {
 class SlideAnimation;
 }
 
 namespace views {
 
 class BoundsAnimator;
 class View;
 
-class BoundsAnimatorObserver {
+class VIEWS_EXPORT BoundsAnimatorObserver {
  public:
   // Invoked when all animations are complete.
   virtual void OnBoundsAnimatorDone(BoundsAnimator* animator) = 0;
 };
 
 // Bounds animator is responsible for animating the bounds of a view from the
 // the views current location and size to a target position and size. To use
 // BoundsAnimator invoke AnimateViewTo for the set of views you want to
 // animate.
 //
@@ skipping 47 matching lines @@
   // Returns true if BoundsAnimator is animating the bounds of |view|.
   bool IsAnimating(View* view) const;
 
   // Returns true if BoundsAnimator is animating any view.
   bool IsAnimating() const;
 
   // Cancels all animations, leaving the views at their current location and
   // size. Any views marked for deletion are deleted.
   void Cancel();
 
-  void set_observer(BoundsAnimatorObserver* observer) {
-    observer_ = observer;
-  }
+  // Overrides default animation duration. |duration_ms| is the new duration in
+  // milliseconds.
+  void SetAnimationDuration(int duration_ms);
+
+  void AddObserver(BoundsAnimatorObserver* observer);
+  void RemoveObserver(BoundsAnimatorObserver* observer);
 
  protected:
   // Creates the animation to use for animating views.
   virtual ui::SlideAnimation* CreateAnimation();
 
  private:
   // Tracks data about the view being animated.
   struct Data {
     Data()
         : delete_delegate_when_done(false),
@@ skipping 50 matching lines @@
 
   // ui::AnimationContainerObserver overrides.
   virtual void AnimationContainerProgressed(
       ui::AnimationContainer* container) OVERRIDE;
   virtual void AnimationContainerEmpty(
       ui::AnimationContainer* container) OVERRIDE;
 
   // Parent of all views being animated.
   View* parent_;
 
-  BoundsAnimatorObserver* observer_;
+  ObserverList<BoundsAnimatorObserver> observers_;
 
   // All animations we create up with the same container.
   scoped_refptr<ui::AnimationContainer> container_;
 
   // Maps from view being animated to info about the view.
   ViewToDataMap data_;
 
   // Maps from animation to view.
   AnimationToViewMap animation_to_view_;
 
   // As the animations we create update (AnimationProgressed is invoked) this
   // is updated. When all the animations have completed for a given tick of
   // the timer (AnimationContainerProgressed is invoked) the parent_ is asked
   // to repaint these bounds.
   gfx::Rect repaint_bounds_;
 
+  int animation_duration_ms_;
+
   DISALLOW_COPY_AND_ASSIGN(BoundsAnimator);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_ANIMATION_BOUNDS_ANIMATOR_H_