Move download shelf from per-tab to per-window

chrome/browser/views/download_shelf_view.cc

 // Copyright (c) 2006-2008 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/download_shelf_view.h"
 
 #include <algorithm>
 
 #include "app/gfx/canvas.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
+#include "chrome/browser/browser.h"
 #include "chrome/browser/download/download_item_model.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/tab_contents/navigation_entry.h"
-#include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/browser/views/download_item_view.h"
+#include "chrome/browser/views/frame/browser_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "views/background.h"
 #include "views/controls/button/image_button.h"
 #include "views/controls/image_view.h"
 
 // Max number of download views we'll contain. Any time a view is added and
 // we already have this many download views, one is removed.
 static const size_t kMaxDownloadViews = 15;
 
@@ skipping 37 matching lines @@
   size->Enlarge(view_preferred.width(), 0);
   size->set_height(std::max(view_preferred.height(), size->height()));
 }
 
 int CenterPosition(int size, int target_size) {
   return std::max((target_size - size) / 2, kTopBottomPadding);
 }
 
 }  // namespace
 
-// static
-DownloadShelf* DownloadShelf::Create(TabContents* tab_contents) {
-  return new DownloadShelfView(tab_contents);
-}
-
-DownloadShelfView::DownloadShelfView(TabContents* tab_contents)
-    : DownloadShelf(tab_contents) {
+DownloadShelfView::DownloadShelfView(Browser* browser, BrowserView* parent)
+    : DownloadShelf(browser), parent_(parent) {
+  parent->AddChildView(this);
   Init();
 }
 
 void DownloadShelfView::Init() {
   ResourceBundle &rb = ResourceBundle::GetSharedInstance();
   arrow_image_ = new views::ImageView();
   arrow_image_->SetImage(rb.GetBitmapNamed(IDR_DOWNLOADS_FAVICON));
   AddChildView(arrow_image_);
 
   show_all_view_ =
       new views::Link(l10n_util::GetString(IDS_SHOW_ALL_DOWNLOADS));
   show_all_view_->SetController(this);
   AddChildView(show_all_view_);
 
   close_button_ = new views::ImageButton(this);
   close_button_->SetImage(views::CustomButton::BS_NORMAL,
                           rb.GetBitmapNamed(IDR_CLOSE_BAR));
   close_button_->SetImage(views::CustomButton::BS_HOT,
                           rb.GetBitmapNamed(IDR_CLOSE_BAR_H));
   close_button_->SetImage(views::CustomButton::BS_PUSHED,
                           rb.GetBitmapNamed(IDR_CLOSE_BAR_P));
   AddChildView(close_button_);
   set_background(views::Background::CreateSolidBackground(kBackgroundColor));
 
   new_item_animation_.reset(new SlideAnimation(this));
   new_item_animation_->SetSlideDuration(kNewItemAnimationDurationMs);
 
   shelf_animation_.reset(new SlideAnimation(this));
   shelf_animation_->SetSlideDuration(kShelfAnimationDurationMs);
-  shelf_animation_->Show();
-
-  // The download shelf view is always owned by its tab contents.
-  SetParentOwned(false);
+  Show();
 }
 
 void DownloadShelfView::AddDownloadView(View* view) {
-  shelf_animation_->Show();
+  Show();
 
   DCHECK(view);
   download_views_.push_back(view);
   AddChildView(view);
   if (download_views_.size() > kMaxDownloadViews)
     RemoveDownloadView(*download_views_.begin());
 
   new_item_animation_->Reset();
   new_item_animation_->Show();
 }
 
 void DownloadShelfView::AddDownload(BaseDownloadItemModel* download_model) {
   DownloadItemView* view = new DownloadItemView(
       download_model->download(), this, download_model);
   AddDownloadView(view);
 }
 
 void DownloadShelfView::RemoveDownloadView(View* view) {
   DCHECK(view);
   std::vector<View*>::iterator i =
     find(download_views_.begin(), download_views_.end(), view);
   DCHECK(i != download_views_.end());
   download_views_.erase(i);
   RemoveChildView(view);
   delete view;
   if (download_views_.empty())
-    tab_contents_->SetDownloadShelfVisible(false);
+    Close();
   Layout();
   SchedulePaint();
 }
 
 void DownloadShelfView::Paint(gfx::Canvas* canvas) {
   PaintBackground(canvas);
   PaintBorder(canvas);
 }
 
 void DownloadShelfView::PaintBorder(gfx::Canvas* canvas) {
@@ skipping 22 matching lines @@
   if (animation == new_item_animation_.get()) {
     Layout();
     SchedulePaint();
   } else if (animation == shelf_animation_.get()) {
     // Force a re-layout of the parent, which will call back into
     // GetPreferredSize, where we will do our animation. In the case where the
     // animation is hiding, we do a full resize - the fast resizing would
     // otherwise leave blank white areas where the shelf was and where the
     // user's eye is. Thankfully bottom-resizing is a lot faster than
     // top-resizing.
-    tab_contents_->ToolbarSizeChanged(shelf_animation_->IsShowing());
+    parent_->SelectedTabToolbarSizeChanged(shelf_animation_->IsShowing());
   }
 }
 
 void DownloadShelfView::AnimationEnded(const Animation *animation) {
   if (animation == shelf_animation_.get()) {
-    tab_contents_->SetDownloadShelfVisible(shelf_animation_->IsShowing());
+    if (download_views_.empty())
+      parent_->SetDownloadShelfVisible(shelf_animation_->IsShowing());
   }
 }
 
 void DownloadShelfView::Layout() {
-  // When the download shelf is not visible it is not parented to anything,
-  // which means it is not safe to lay out the controls, so we return early.
-  // Otherwise, we can have problems when for example the user switches to
-  // another tab (that doesn't have a download shelf) _before_ the download
-  // has started and we'll crash when calling SetVisible() below because
-  // the NativeControlContainer ctor tries to use the Container.
-  if (!GetWidget())
-    return;
-
   // 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
   // "Show all downloads" link to the left to make it more visible that there is
   // something to see.
   bool show_link_only = !CanFitFirstDownloadItem();
 
   gfx::Size image_size = arrow_image_->GetPreferredSize();
   gfx::Size close_button_size = close_button_->GetPreferredSize();
@@ skipping 73 matching lines @@
 
   gfx::Size item_size = (*download_views_.rbegin())->GetPreferredSize();
   return item_size.width() < available_width;
 }
 
 void DownloadShelfView::LinkActivated(views::Link* source, int event_flags) {
   ShowAllDownloads();
 }
 
 void DownloadShelfView::ButtonPressed(views::Button* button) {
-  shelf_animation_->Hide();
+  Close();
 }
 
 bool DownloadShelfView::IsShowing() const {
   return shelf_animation_->IsShowing();
 }
 
 bool DownloadShelfView::IsClosing() const {
   // TODO(estade): This is never called. For now just return false.
   return false;
 }
+
+void DownloadShelfView::Show() {
+  shelf_animation_->Show();
+}
+
+void DownloadShelfView::Close() {
+  parent_->SetDownloadShelfVisible(false);
+  shelf_animation_->Hide();
+}