diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 19:54:32 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-10-14 19:54:32 +0000 |
| commit | 26783d056f3639d6310c41d1f499d5a9b13bbf90 (patch) | |
| tree | 35c754f8a0c06923695ecc73d27f775d375416d4 /chrome/browser/views/tabs/tab_strip.h | |
| parent | 9486c1fe61ac28f5a4cb0a371ee4409a1208a965 (diff) | |
| download | chromium_src-26783d056f3639d6310c41d1f499d5a9b13bbf90.zip chromium_src-26783d056f3639d6310c41d1f499d5a9b13bbf90.tar.gz chromium_src-26783d056f3639d6310c41d1f499d5a9b13bbf90.tar.bz2 | |
Changes tab strip to only cancel animations if layout is invoked and
the size actually changes. Layout was the wrong place for the check
before as Layout may be invoked even if the size hasn't changed.
BUG=59164
TEST=make sure tabstrip on windows still has animations.
Review URL: http://codereview.chromium.org/3782006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@62625 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/views/tabs/tab_strip.h')
| -rw-r--r-- | chrome/browser/views/tabs/tab_strip.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/views/tabs/tab_strip.h b/chrome/browser/views/tabs/tab_strip.h index 188868d..f7ec80fd 100644 --- a/chrome/browser/views/tabs/tab_strip.h +++ b/chrome/browser/views/tabs/tab_strip.h @@ -73,7 +73,6 @@ class TabStrip : public BaseTabStrip, // views::View overrides: virtual void PaintChildren(gfx::Canvas* canvas); virtual views::View* GetViewByID(int id) const; - virtual void Layout(); virtual gfx::Size GetPreferredSize(); // NOTE: the drag and drop methods are invoked from FrameView. This is done to // allow for a drop region that extends outside the bounds of the TabStrip. @@ -92,6 +91,7 @@ class TabStrip : public BaseTabStrip, virtual void StartMoveTabAnimation(); virtual void AnimateToIdealBounds(); virtual bool ShouldHighlightCloseButtonAfterRemove(); + virtual void DoLayout(); // views::View implementation: virtual void ViewHierarchyChanged(bool is_add, |