Move download shelf from per-tab to per-window

chrome/browser/gtk/download_item_gtk.h

 // Copyright (c) 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.
 
 #ifndef CHROME_BROWSER_GTK_DOWNLOAD_ITEM_GTK_H_
 #define CHROME_BROWSER_GTK_DOWNLOAD_ITEM_GTK_H_
 
 #include <gtk/gtk.h>
 
 #include "app/animation.h"
 #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;
 class DownloadShelfGtk;
 class NineBox;
 class SkBitmap;
 class SlideAnimation;
 
 class DownloadItemGtk : public DownloadItem::Observer,
                         public AnimationDelegate {
  public:
   // DownloadItemGtk takes ownership of |download_item_model|.
   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.
   virtual void OnDownloadUpdated(DownloadItem* download);
   virtual void OnDownloadOpened(DownloadItem* download) { }
 
   // AnimationDelegate implementation.
   virtual void AnimationProgressed(const Animation* animation);
 
   // Called when the icon manager has finished loading the icon. We take
@@ skipping 61 matching lines @@
   static NineBox* menu_nine_box_prelight_;
   static NineBox* menu_nine_box_active_;
 
   // Ninebox for the background of the dangerous download prompt.
   static NineBox* dangerous_nine_box_;
 
   // The shelf on which we are displayed.
   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_;
 
   // The GtkLabel that holds the status text.
   GtkWidget* status_label_;
 
   // The widget that creates a dropdown menu when pressed.
   GtkWidget* menu_button_;
 
   // Whether the menu is currently showing for |menu_button_|. Affects how we
   // draw the button.
   bool menu_showing_;
 
   // 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_;
 
   // The menu that pops down when the user presses |menu_button_|. We do not
   // create this until the first time we actually need it.
   scoped_ptr<DownloadShelfContextMenuGtk> menu_;
 
   // The download item model we represent.
   scoped_ptr<BaseDownloadItemModel> download_model_;
@@ skipping 24 matching lines @@
   scoped_ptr<SlideAnimation> complete_animation_;
 
   // The file icon for the download. May be null.
   SkBitmap* icon_;
 
   // For canceling an in progress icon request.
   CancelableRequestConsumerT<int, 0> icon_consumer_;
 };
 
 #endif  // CHROME_BROWSER_GTK_DOWNLOAD_ITEM_GTK_H_