Move download shelf from per-tab to per-window

chrome/browser/tab_contents/tab_contents_view_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/tab_contents/tab_contents_view_gtk.h"
 
 #include <gdk/gdk.h>
 #include <gtk/gtk.h>
 
 #include "base/string_util.h"
@@ skipping 80 matching lines @@
 
 }  // namespace
 
 // static
 TabContentsView* TabContentsView::Create(TabContents* tab_contents) {
   return new TabContentsViewGtk(tab_contents);
 }
 
 TabContentsViewGtk::TabContentsViewGtk(TabContents* tab_contents)
     : TabContentsView(tab_contents),
-      vbox_(gtk_vbox_new(FALSE, 0)) {
-  fixed_ = gtk_fixed_new();
-  gtk_box_pack_start(GTK_BOX(vbox_.get()), fixed_, TRUE, TRUE, 0);
-  g_signal_connect(fixed_, "size-allocate",
+      fixed_(gtk_fixed_new()) {
+  g_signal_connect(fixed_.get(), "size-allocate",
                    G_CALLBACK(OnSizeAllocate), this);
-  gtk_widget_show(fixed_);
+  gtk_widget_show(fixed_.get());
   registrar_.Add(this, NotificationType::TAB_CONTENTS_CONNECTED,
                  Source<TabContents>(tab_contents));
   registrar_.Add(this, NotificationType::TAB_CONTENTS_DISCONNECTED,
                  Source<TabContents>(tab_contents));
 }
 
 TabContentsViewGtk::~TabContentsViewGtk() {
-  vbox_.Destroy();
+  fixed_.Destroy();
 }
 
 void TabContentsViewGtk::CreateView() {
   // Windows uses this to do initialization, but we do all our initialization
   // in the constructor.
 }
 
 RenderWidgetHostView* TabContentsViewGtk::CreateViewForWidget(
     RenderWidgetHost* render_widget_host) {
   if (render_widget_host->view()) {
@@ skipping 21 matching lines @@
   gtk_widget_add_events(content_view, GDK_LEAVE_NOTIFY_MASK |
                         GDK_POINTER_MOTION_MASK);
   g_signal_connect(content_view, "button-press-event",
                    G_CALLBACK(OnMouseDown), this);
 
   InsertIntoContentArea(content_view);
   return view;
 }
 
 gfx::NativeView TabContentsViewGtk::GetNativeView() const {
-  return vbox_.get();
+  return fixed_.get();
 }
 
 gfx::NativeView TabContentsViewGtk::GetContentNativeView() const {
   if (!tab_contents()->render_widget_host_view())
     return NULL;
   return tab_contents()->render_widget_host_view()->GetPluginNativeView();
 }
 
 
 gfx::NativeWindow TabContentsViewGtk::GetTopLevelNativeWindow() const {
   GtkWidget* window = gtk_widget_get_ancestor(GetNativeView(), GTK_TYPE_WINDOW);
   return window ? GTK_WINDOW(window) : NULL;
 }
 
 void TabContentsViewGtk::GetContainerBounds(gfx::Rect* out) const {
   // This is used for positioning the download shelf arrow animation,
   // as well as sizing some other widgets in Windows.  In GTK the size is
   // managed for us, so it appears to be only used for the download shelf
   // animation.
   int x = 0;
   int y = 0;
-  if (vbox_.get()->window)
-    gdk_window_get_origin(vbox_.get()->window, &x, &y);
-  out->SetRect(x + vbox_.get()->allocation.x, y + vbox_.get()->allocation.y,
-               vbox_.get()->allocation.width, vbox_.get()->allocation.height);
+  if (fixed_.get()->window)
+    gdk_window_get_origin(fixed_.get()->window, &x, &y);
+  out->SetRect(x + fixed_.get()->allocation.x, y + fixed_.get()->allocation.y,
+               fixed_.get()->allocation.width, fixed_.get()->allocation.height);
 }
 
 void TabContentsViewGtk::OnContentsDestroy() {
   // TODO(estade): Windows uses this function cancel pending drag-n-drop drags.
   // We don't have drags yet, so do nothing for now.
 }
 
 void TabContentsViewGtk::SetPageTitle(const std::wstring& title) {
   // Set the window name to include the page title so it's easier to spot
   // when debugging (e.g. via xwininfo -tree).
@@ skipping 105 matching lines @@
 
   // Until we have d'n'd implemented, just immediately pretend we're
   // already done with the drag and drop so we don't get stuck
   // thinking we're in mid-drag.
   // TODO(port): remove me when the above NOTIMPLEMENTED is fixed.
   if (tab_contents()->render_view_host())
     tab_contents()->render_view_host()->DragSourceSystemDragEnded();
 }
 
 void TabContentsViewGtk::InsertIntoContentArea(GtkWidget* widget) {
-  gtk_fixed_put(GTK_FIXED(fixed_), widget, 0, 0);
+  gtk_fixed_put(GTK_FIXED(fixed_.get()), widget, 0, 0);
 }
 
 gboolean TabContentsViewGtk::OnMouseDown(GtkWidget* widget,
     GdkEventButton* event, TabContentsViewGtk* view) {
   view->last_mouse_down_time_ = event->time;
   return FALSE;
 }
 
 gboolean TabContentsViewGtk::OnSizeAllocate(GtkWidget* widget,
                                             GtkAllocation* allocation,
                                             TabContentsViewGtk* view) {
   int width = allocation->width;
-  DownloadShelf* shelf = view->tab_contents()->GetDownloadShelf(false);
-  int height = shelf && shelf->IsClosing() ?
-               widget->parent->allocation.height : allocation->height;
+  int height = allocation->height;
   height += view->tab_contents()->delegate()->GetExtraRenderViewHeight();
   gfx::Size size(width, height);
   gtk_container_foreach(GTK_CONTAINER(widget), SetSizeRequest, &size);
 
   return FALSE;
 }