Linux findbar improvements:...

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 "base/base_paths_linux.h"
 #include "base/command_line.h"
@@ skipping 242 matching lines @@
   toolbar_->AddToolbarToBox(content_vbox_);
 
   bookmark_bar_.reset(new BookmarkBarGtk(browser_->profile(), browser_.get()));
   bookmark_bar_->AddBookmarkbarToBox(content_vbox_);
 
   infobar_container_.reset(new InfoBarContainerGtk(this));
   gtk_box_pack_start(GTK_BOX(content_vbox_),
                      infobar_container_->widget(),
                      FALSE, FALSE, 0);
 
-  // Insert a border between the toolbar and the web contents.
-  GtkWidget* border = gtk_event_box_new();
-  gtk_widget_set_size_request(border, -1, 1);
-  gtk_widget_modify_bg(border, GTK_STATE_NORMAL, &kBorderColor);
-  gtk_box_pack_start(GTK_BOX(content_vbox_), border, FALSE, FALSE, 0);
-  gtk_widget_show(border);
-
   contents_container_.reset(new TabContentsContainerGtk());
   contents_container_->AddContainerToBox(content_vbox_);
 
   // Note that calling this the first time is necessary to get the
   // proper control layout.
   // TODO(port): make this a pref.
   SetCustomFrame(false);
 
   status_bubble_.reset(new StatusBubbleGtk(window_));
 
@@ skipping 363 matching lines @@
       NotificationType::WINDOW_CLOSED,
       Source<GtkWindow>(window_),
       NotificationService::NoDetails());
   return true;
 }
 
 bool BrowserWindowGtk::ShouldShowWindowIcon() const {
   return browser_->SupportsWindowFeature(Browser::FEATURE_TITLEBAR);
 }
 
-void BrowserWindowGtk::AddFindBar(GtkWidget* findbar) {
-  contents_container_->AddFindBar(findbar);
+void BrowserWindowGtk::AddFindBar(FindBarGtk* findbar) {
+  contents_container_->set_find_bar(findbar);
+  gtk_box_pack_start(GTK_BOX(content_vbox_), findbar->widget(),
+                     FALSE, FALSE, 0);
+  gtk_box_reorder_child(GTK_BOX(content_vbox_), findbar->widget(), 2);
 }
 
 void BrowserWindowGtk::ConnectAccelerators() {
   GtkAccelGroup* accel_group = gtk_accel_group_new();
   gtk_window_add_accel_group(window_, accel_group);
   // Drop the initial ref on |accel_group| so |window_| will own it.
   g_object_unref(accel_group);
 
   for (size_t i = 0; i < arraysize(kAcceleratorMap); ++i) {
     gtk_accel_group_connect(
@@ skipping 35 matching lines @@
   } else {
     browser_window->ExecuteBrowserCommand(command_id);
   }
 
   return TRUE;
 }
 
 void BrowserWindowGtk::ExecuteBrowserCommand(int id) {
   browser_->ExecuteCommand(id);
 }