Improved tab overview animations with better animation and wiring to...

chrome/browser/views/tabs/grid.h

 // Copyright (c) 2009 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 CHROME_BROWSER_VIEWS_TABS_GRID_H_
 #define CHROME_BROWSER_VIEWS_TABS_GRID_H_
 
 #include <vector>
 
 #include "app/slide_animation.h"
@@ skipping 47 matching lines @@
 
   // Returns the width of a cell.
   int cell_width() const { return cell_width_; }
 
   // Returns the height of a cell.
   int cell_height() const { return cell_height_; }
 
   // Returns the bounds of the specified cell.
   gfx::Rect CellBounds(int index);
 
+  // Returns the value based on the current animation. |start| gives the
+  // starting coordinate and |target| the target coordinate. The resulting
+  // value is between |start| and |target| based on the current animation.
+  int AnimationPosition(int start, int target);
+
+  // Convenience for returning a rectangle between |start_bounds| and
+  // |target_bounds| based on the current animation.
+  gfx::Rect AnimationPosition(const gfx::Rect& start_bounds,
+                              const gfx::Rect& target_bounds);
+
   // View overrides.
   virtual void ViewHierarchyChanged(bool is_add,
                                     views::View* parent,
                                     views::View* child);
   virtual gfx::Size GetPreferredSize();
   virtual void Layout();
   void PaintChildren(gfx::Canvas* canvas);
 
   // AnimationDelegate overrides.
   virtual void AnimationEnded(const Animation* animation);
   virtual void AnimationProgressed(const Animation* animation);
   virtual void AnimationCanceled(const Animation* animation);
 
   // Padding between cells.
   static const int kCellXPadding;
   static const int kCellYPadding;
 
  private:
   // Calculates the bounds of each of the cells, adding the result to |bounds|.
   void CalculateCellBounds(std::vector<gfx::Rect>* bounds);
 
   // Resets start_bounds_ to the bounds of the current cells, and invokes
   // CalculateCellBounds to determine the target bounds. Then starts the
   // animation if it isn't already running.
   void CalculateTargetBoundsAndStartAnimation();
 
   // Resets the bounds of each cell to that of target_bounds_.
   void SetViewBoundsToTarget();
 
-  // Returns the value based on the current animation. |start| gives the
-  // starting coordinate and |target| the target coordinate. The resulting
-  // value is between |start| and |target| based on the current animation.
-  int AnimationPosition(int start, int target);
-
   // The animation.
   SlideAnimation animation_;
 
   // If true, we're adding/removing a child and can ignore the change in
   // ViewHierarchyChanged.
   bool modifying_children_;
 
   // Do we need a layout? This is set to true any time a child is added/removed.
   bool needs_layout_;
 
@@ skipping 18 matching lines @@
   // Used during animation, gives the initial bounds of the views.
   std::vector<gfx::Rect> start_bounds_;
 
   // Used during animation, gives the target bounds of the views.
   std::vector<gfx::Rect> target_bounds_;
 
   DISALLOW_COPY_AND_ASSIGN(Grid);
 };
 
 #endif  // CHROME_BROWSER_VIEWS_TABS_GRID_H_