Move download shelf from per-tab to per-window

chrome/browser/gtk/browser_window_gtk.cc

 // 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.
 
 #include "chrome/browser/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "app/resource_bundle.h"
 #include "base/base_paths_linux.h"
 #include "base/gfx/gtk_util.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/time.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/bookmarks/bookmark_utils.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
+#include "chrome/browser/download/download_item_model.h"
+#include "chrome/browser/download/download_manager.h"
 #include "chrome/browser/gtk/about_chrome_dialog.h"
 #include "chrome/browser/gtk/bookmark_bar_gtk.h"
 #include "chrome/browser/gtk/browser_toolbar_gtk.h"
 #include "chrome/browser/gtk/clear_browsing_data_dialog_gtk.h"
+#include "chrome/browser/gtk/download_shelf_gtk.h"
 #include "chrome/browser/gtk/go_button_gtk.h"
 #include "chrome/browser/gtk/import_dialog_gtk.h"
 #include "chrome/browser/gtk/infobar_container_gtk.h"
 #include "chrome/browser/gtk/find_bar_gtk.h"
 #include "chrome/browser/gtk/status_bubble_gtk.h"
 #include "chrome/browser/gtk/tab_contents_container_gtk.h"
 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"
 #include "chrome/browser/gtk/toolbar_star_toggle_gtk.h"
 #include "chrome/browser/location_bar.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
@@ skipping 516 matching lines @@
 
 void BrowserWindowGtk::ShowBookmarkManager() {
   NOTIMPLEMENTED();
 }
 
 void BrowserWindowGtk::ShowBookmarkBubble(const GURL& url,
                                           bool already_bookmarked) {
   toolbar_->star()->ShowStarBubble(url, !already_bookmarked);
 }
 
+bool BrowserWindowGtk::IsDownloadShelfVisible() const {
+  return download_shelf_.get() && download_shelf_->IsShowing();
+}
+
+DownloadShelf* BrowserWindowGtk::GetDownloadShelf() {
+  if (!download_shelf_.get())
+    download_shelf_.reset(new DownloadShelfGtk(browser_.get(),
+                                               render_area_vbox_));
+  return download_shelf_.get();
+}
+
 void BrowserWindowGtk::ShowReportBugDialog() {
   NOTIMPLEMENTED();
 }
 
 void BrowserWindowGtk::ShowClearBrowsingDataDialog() {
   ClearBrowsingDataDialogGtk::Show(window_, browser_->profile());
 }
 
 void BrowserWindowGtk::ShowImportDialog() {
   ImportDialogGtk::Show(window_, browser_->profile());
@@ skipping 18 matching lines @@
 void BrowserWindowGtk::ShowHTMLDialog(HtmlDialogUIDelegate* delegate,
                                       gfx::NativeWindow parent_window) {
   NOTIMPLEMENTED();
 }
 
 void BrowserWindowGtk::UserChangedTheme() {
   NOTIMPLEMENTED();
 }
 
 int BrowserWindowGtk::GetExtraRenderViewHeight() const {
-  // The download shelf is controlled by its TabContents, so we don't have to
-  // worry about it here.
   int sum = infobar_container_->TotalHeightOfClosingBars();
   if (bookmark_bar_->IsClosing())
     sum += bookmark_bar_->GetHeight();
+  if (download_shelf_.get() && download_shelf_->IsClosing()) {
+    sum += download_shelf_->GetHeight();
+  }
   return sum;
 }
 
 void BrowserWindowGtk::ConfirmBrowserCloseWithPendingDownloads() {
   NOTIMPLEMENTED();
   browser_->InProgressDownloadResponse(false);
 }
 
 void BrowserWindowGtk::Observe(NotificationType type,
                                const NotificationSource& source,
@@ skipping 241 matching lines @@
 }
 
 bool BrowserWindowGtk::IsTabStripSupported() {
   return browser_->SupportsWindowFeature(Browser::FEATURE_TABSTRIP);
 }
 
 bool BrowserWindowGtk::IsToolbarSupported() {
   return browser_->SupportsWindowFeature(Browser::FEATURE_TOOLBAR) ||
          browser_->SupportsWindowFeature(Browser::FEATURE_LOCATIONBAR);
 }