Linux: Make the findbar hang over the render view.

chrome/browser/gtk/tab_contents_container_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/tab_contents_container_gtk.h"
 
 #include "base/gfx/native_widget_types.h"
 #include "chrome/browser/tab_contents/web_contents.h"
 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"
 #include "chrome/common/notification_service.h"
 
 
 TabContentsContainerGtk::TabContentsContainerGtk()
     : tab_contents_(NULL),
-      vbox_(gtk_vbox_new(FALSE, 0)) {
-  gtk_widget_show(vbox_);
+      vbox_(gtk_vbox_new(FALSE, 0)),
+      fixed_(gtk_fixed_new()),
+      findbar_(NULL) {
+  gtk_widget_set_size_request(fixed_, -1, 0);
+  gtk_box_pack_start(GTK_BOX(vbox_), fixed_, FALSE, FALSE, 0);
+  gtk_widget_show_all(vbox_);
+  g_signal_connect(fixed_, "size-allocate",
+                   G_CALLBACK(OnSizeAllocate), this);
 }
 
 TabContentsContainerGtk::~TabContentsContainerGtk() {
   if (tab_contents_)
     RemoveObservers();
 }
 
 void TabContentsContainerGtk::AddContainerToBox(GtkWidget* box) {
   gtk_box_pack_start(GTK_BOX(box), vbox_, TRUE, TRUE, 0);
 }
 
 void TabContentsContainerGtk::AddFindBar(GtkWidget* findbar) {
-  gtk_box_pack_start(GTK_BOX(vbox_), findbar, FALSE, FALSE, 0);
+  findbar_ = findbar;
+  // We will reposition it later (when we get a size-allocate event).
+  gtk_fixed_put(GTK_FIXED(fixed_), findbar, 0, 0);
 }
 
 void TabContentsContainerGtk::SetTabContents(TabContents* tab_contents) {
   if (tab_contents_) {
     gfx::NativeView widget = tab_contents_->GetNativeView();
     if (widget)
       gtk_container_remove(GTK_CONTAINER(vbox_), widget);
 
     tab_contents_->WasHidden();
 
@@ skipping 67 matching lines @@
   // RENDER_VIEW_HOST_CHANGED notification. This was used on Windows for focus
   // issues, and I'm not entirely convinced that this isn't necessary.
 }
 
 void TabContentsContainerGtk::TabContentsDestroyed(TabContents* contents) {
   // Sometimes, a TabContents is destroyed before we know about it. This allows
   // us to clean up our state in case this happens.
   DCHECK(contents == tab_contents_);
   SetTabContents(NULL);
 }
+
+void TabContentsContainerGtk::OnSizeAllocate(GtkWidget* fixed,
+    GtkAllocation* allocation, TabContentsContainerGtk* contents_container) {
+  GtkWidget* findbar = contents_container->findbar_;
+  DCHECK(findbar);
+  if (!GTK_WIDGET_VISIBLE(findbar))
+    return;
+
+  // TODO(port): Logic for the positioning of the find bar should be factored
+  // out of here and browser/views/* and into FindBarController.
+  int xposition = allocation->width - findbar->allocation.width - 50;
+  if (xposition == findbar->allocation.x) {
+    return;
+  } else {
+    gtk_fixed_move(GTK_FIXED(fixed), findbar, xposition, 0);
+  }
+}