Move download shelf from per-tab to per-window

chrome/browser/views/frame/browser_view.cc

 // Copyright (c) 2006-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.
 
 #include "chrome/browser/views/frame/browser_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 282 matching lines @@
 // static
 void BrowserView::SetShowState(int state) {
   explicit_show_state = state;
 }
 
 BrowserView::BrowserView(Browser* browser)
     : views::ClientView(NULL, NULL),
       frame_(NULL),
       browser_(browser),
       active_bookmark_bar_(NULL),
-      active_download_shelf_(NULL),
       tabstrip_(NULL),
       toolbar_(NULL),
+      download_shelf_(NULL),
       infobar_container_(NULL),
       find_bar_y_(0),
       contents_container_(NULL),
       initialized_(false),
       ignore_layout_(false),
 #if defined(OS_WIN)
       hung_window_detector_(&hung_plugin_action_),
       ticker_(0),
 #endif
       extension_shelf_(NULL) {
@@ skipping 493 matching lines @@
 
 gfx::Rect BrowserView::GetRootWindowResizerRect() const {
   if (frame_->GetWindow()->IsMaximized() || frame_->GetWindow()->IsFullscreen())
     return gfx::Rect();
 
   // We don't specify a resize corner size if we have a bottom shelf either.
   // This is because we take care of drawing the resize corner on top of that
   // shelf, so we don't want others to do it for us in this case.
   // Currently, the only visible bottom shelf is the download shelf.
   // Other tests should be added here if we add more bottom shelves.
-  TabContents* current_tab = browser_->GetSelectedTabContents();
-  if (current_tab && current_tab->IsDownloadShelfVisible()) {
-    DownloadShelf* download_shelf = current_tab->GetDownloadShelf(true);
-    if (download_shelf && download_shelf->IsShowing())
-      return gfx::Rect();
+  if (download_shelf_ && download_shelf_->IsShowing()) {
+    return gfx::Rect();
   }
 
   gfx::Rect client_rect = contents_container_->bounds();
   gfx::Size resize_corner_size = ResizeCorner::GetSize();
   int x = client_rect.width() - resize_corner_size.width();
   if (l10n_util::GetTextDirection() == l10n_util::RIGHT_TO_LEFT)
     x = 0;
   return gfx::Rect(x, client_rect.height() - resize_corner_size.height(),
                    resize_corner_size.width(), resize_corner_size.height());
 }
@@ skipping 11 matching lines @@
 }
 
 void BrowserView::ShowBookmarkManager() {
   browser::ShowBookmarkManagerView(browser_->profile());
 }
 
 void BrowserView::ShowBookmarkBubble(const GURL& url, bool already_bookmarked) {
   toolbar_->star_button()->ShowStarBubble(url, !already_bookmarked);
 }
 
+void BrowserView::SetDownloadShelfVisible(bool visible) {
+  if (IsDownloadShelfVisible() != visible) {
+    if (visible) {
+      // Invoke GetDownloadShelf to force the shelf to be created.
+      GetDownloadShelf();
+    }
+
+    browser_->UpdateDownloadShelfVisibility(visible);
+  }
+
+  // SetDownloadShelfVisible can force-close the shelf, so make sure we lay out
+  // everything correctly, as if the animation had finished. This doesn't
+  // matter for showing the shelf, as the show animation will do it.
+  SelectedTabToolbarSizeChanged(false);
+}
+
+bool BrowserView::IsDownloadShelfVisible() const {
+  return download_shelf_ && download_shelf_->IsShowing();
+}
+
+DownloadShelf* BrowserView::GetDownloadShelf() {
+  if (!download_shelf_)
+    download_shelf_ = new DownloadShelfView(browser_.get(), this);
+  return download_shelf_;
+}
+
 void BrowserView::ShowReportBugDialog() {
   // Retrieve the URL for the current tab (if any) and tell the BugReportView
   TabContents* current_tab = browser_->GetSelectedTabContents();
   if (!current_tab)
     return;
   browser::ShowBugReportView(GetWidget(), browser_->profile(), current_tab);
 }
 
 void BrowserView::ShowClearBrowsingDataDialog() {
   browser::ShowClearBrowsingDataView(GetWidget(), browser_->profile());
@@ skipping 577 matching lines @@
   infobar_container_->SetVisible(visible);
   infobar_container_->SetBounds(0, top, width(), height);
   return top + height;
 }
 
 void BrowserView::LayoutTabContents(int top, int bottom) {
   contents_container_->SetBounds(0, top, width(), bottom - top);
 }
 
 int BrowserView::LayoutDownloadShelf(int bottom) {
-  if (active_download_shelf_) {
+  if (IsDownloadShelfVisible()) {
     bool visible = browser_->SupportsWindowFeature(
         Browser::FEATURE_DOWNLOADSHELF);
-    int height =
-        visible ? active_download_shelf_->GetPreferredSize().height() : 0;
-    active_download_shelf_->SetVisible(visible);
-    active_download_shelf_->SetBounds(0, bottom - height, width(), height);
-    active_download_shelf_->Layout();
+    DCHECK(download_shelf_);
+    int height = visible ? download_shelf_->GetPreferredSize().height() : 0;
+    download_shelf_->SetVisible(visible);
+    download_shelf_->SetBounds(0, bottom - height, width(), height);
+    download_shelf_->Layout();
     bottom -= height;
   }
   return bottom;
 }
 
 void BrowserView::LayoutStatusBubble(int top) {
   // In restored mode, the client area has a client edge between it and the
   // frame.
   int overlap = StatusBubbleViews::kShadowThickness +
       (IsMaximized() ? 0 : views::NonClientFrameView::kClientEdgeThickness);
@@ skipping 35 matching lines @@
   return UpdateChildViewAndLayout(new_bookmark_bar_view, &active_bookmark_bar_);
 }
 
 bool BrowserView::MaybeShowInfoBar(TabContents* contents) {
   // TODO(beng): Remove this function once the interface between
   //             InfoBarContainer, DownloadShelfView and TabContents and this
   //             view is sorted out.
   return true;
 }
 
-bool BrowserView::MaybeShowDownloadShelf(TabContents* contents) {
-  views::View* new_shelf = NULL;
-  if (contents && contents->IsDownloadShelfVisible()) {
-    new_shelf =
-        static_cast<DownloadShelfView*>(contents->GetDownloadShelf(true));
-    if (new_shelf != active_download_shelf_)
-      new_shelf->AddChildView(new ResizeCorner());
-  }
-  return UpdateChildViewAndLayout(new_shelf, &active_download_shelf_);
-}
-
 void BrowserView::UpdateUIForContents(TabContents* contents) {
   bool needs_layout = MaybeShowBookmarkBar(contents);
   needs_layout |= MaybeShowInfoBar(contents);
-  needs_layout |= MaybeShowDownloadShelf(contents);
   if (needs_layout)
     Layout();
 }
 
 bool BrowserView::UpdateChildViewAndLayout(views::View* new_view,
                                            views::View** old_view) {
   DCHECK(old_view);
   if (*old_view == new_view) {
     // The views haven't changed, if the views pref changed schedule a layout.
     if (new_view) {
@@ skipping 215 matching lines @@
 
 // static
 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
   return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
 }
 
 // static
 void BrowserList::AllBrowsersClosed() {
   views::Window::CloseAllSecondaryWindows();
 }