Move download shelf from per-tab to per-window. Also disable auto-hiding of

the shelf.

BUG=9025
TEST=Download file in one tab, open new tab, and check that download shelf is
still open. Also try the shelf's close button and the "show all downloads"
link. When saving a file, the download animation should not show up.

Review URL: http://codereview.chromium.org/115740


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@17595 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 2 deletions

diff --git a/chrome/browser/views/download_shelf_view.h b/chrome/browser/views/download_shelf_view.h
index 0b722b8..e11d468 100644
--- a/chrome/browser/views/download_shelf_view.h
+++ b/chrome/browser/views/download_shelf_view.h
@@ -16,7 +16,8 @@ class ImageView;
 }
 
 class BaseDownloadItemModel;
-class TabContents;
+class Browser;
+class BrowserView;
 
 class DownloadAnimation;
 
@@ -33,7 +34,7 @@ class DownloadShelfView : public DownloadShelf,
                           public views::LinkController,
                           public AnimationDelegate {
  public:
-  explicit DownloadShelfView(TabContents* tab_contents);
+  explicit DownloadShelfView(Browser* browser, BrowserView* parent);
 
   // Implementation of View.
   virtual gfx::Size GetPreferredSize();
@@ -57,6 +58,8 @@ class DownloadShelfView : public DownloadShelf,
   virtual void AddDownload(BaseDownloadItemModel* download_model);
   virtual bool IsShowing() const;
   virtual bool IsClosing() const;
+  virtual void Show();
+  virtual void Close();
 
   // Removes a specified download view. The supplied view is deleted after
   // it's removed.
@@ -97,6 +100,9 @@ class DownloadShelfView : public DownloadShelf,
   // deleted by View.
   views::ImageButton* close_button_;
 
+  // The window this shelf belongs to.
+  BrowserView* parent_;
+
   DISALLOW_COPY_AND_ASSIGN(DownloadShelfView);
 };