diff options
| -rw-r--r-- | chrome/browser/views/download_shelf_view.cc | 5 | ||||
| -rw-r--r-- | chrome/browser/views/frame/browser_view.cc | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/views/download_shelf_view.cc b/chrome/browser/views/download_shelf_view.cc index dcd7c01..47f0a74 100644 --- a/chrome/browser/views/download_shelf_view.cc +++ b/chrome/browser/views/download_shelf_view.cc @@ -199,7 +199,7 @@ void DownloadShelfView::Layout() { // Let our base class layout our child views views::View::Layout(); - // If there is not enought room to show the first download item, show the + // If there is not enough room to show the first download item, show the // "Show all downloads" link to the left to make it more visible that there is // something to see. bool show_link_only = !CanFitFirstDownloadItem(); @@ -297,8 +297,7 @@ bool DownloadShelfView::IsShowing() const { } bool DownloadShelfView::IsClosing() const { - // TODO(estade): This is never called. For now just return false. - return false; + return shelf_animation_->IsClosing(); } void DownloadShelfView::Show() { diff --git a/chrome/browser/views/frame/browser_view.cc b/chrome/browser/views/frame/browser_view.cc index 0c8b4cb..422a1d6 100644 --- a/chrome/browser/views/frame/browser_view.cc +++ b/chrome/browser/views/frame/browser_view.cc @@ -1576,7 +1576,10 @@ void BrowserView::LayoutTabContents(int top, int bottom) { } int BrowserView::LayoutDownloadShelf(int bottom) { - if (IsDownloadShelfVisible()) { + // Re-layout the shelf either if it is visible or if it's close animation + // is currently running. + if (IsDownloadShelfVisible() || + (download_shelf_.get() && download_shelf_->IsClosing())) { bool visible = browser_->SupportsWindowFeature( Browser::FEATURE_DOWNLOADSHELF); DCHECK(download_shelf_.get()); |