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, 5 insertions, 5 deletions

diff --git a/chrome/browser/gtk/download_item_gtk.h b/chrome/browser/gtk/download_item_gtk.h
index 13680cd..e2fbf10 100644
--- a/chrome/browser/gtk/download_item_gtk.h
+++ b/chrome/browser/gtk/download_item_gtk.h
@@ -11,6 +11,7 @@
 #include "base/scoped_ptr.h"
 #include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/icon_manager.h"
+#include "chrome/common/owned_widget_gtk.h"
 
 class BaseDownloadItemModel;
 class DownloadShelfContextMenuGtk;
@@ -26,8 +27,7 @@ class DownloadItemGtk : public DownloadItem::Observer,
   DownloadItemGtk(DownloadShelfGtk* parent_shelf,
                   BaseDownloadItemModel* download_item_model);
 
-  // We put |hbox_| in |parent_shelf| and rely on |parent_shelf| recursively
-  // destroying its children. Hence we do nothing in the destructor.
+  // Destroys all widgets belonging to this DownloadItemGtk.
   ~DownloadItemGtk();
 
   // DownloadItem::Observer implementation.
@@ -109,11 +109,11 @@ class DownloadItemGtk : public DownloadItem::Observer,
   DownloadShelfGtk* parent_shelf_;
 
   // The widget that contains the body and menu dropdown.
-  GtkWidget* hbox_;
+  OwnedWidgetGtk hbox_;
 
   // The widget that contains the name of the download and the progress
   // animation.
-  GtkWidget* body_;
+  OwnedWidgetGtk body_;
 
   // The GtkLabel that holds the download title text.
   GtkWidget* name_label_;
@@ -130,7 +130,7 @@ class DownloadItemGtk : public DownloadItem::Observer,
 
   // The widget that contains the animation progress and the file's icon
   // (as well as the complete animation).
-  GtkWidget* progress_area_;
+  OwnedWidgetGtk progress_area_;
 
   // In degrees. Only used for downloads with no known total size.
   int progress_angle_;