Linux: Just enough toolbar theming to make everything look normal again....

chrome/browser/gtk/browser_toolbar_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_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/logging.h"
 #include "base/base_paths_linux.h"
 #include "base/path_service.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/browser.h"
+#include "chrome/browser/browser_theme_provider.h"
 #include "chrome/browser/gtk/back_forward_menu_model_gtk.h"
 #include "chrome/browser/gtk/custom_button.h"
 #include "chrome/browser/gtk/go_button_gtk.h"
 #include "chrome/browser/gtk/gtk_chrome_button.h"
 #include "chrome/browser/gtk/location_bar_view_gtk.h"
 #include "chrome/browser/gtk/nine_box.h"
 #include "chrome/browser/gtk/standard_menus.h"
 #include "chrome/browser/gtk/toolbar_star_toggle_gtk.h"
 #include "chrome/browser/net/url_fixer_upper.h"
 #include "chrome/browser/profile.h"
@@ skipping 65 matching lines @@
   SetProfile(profile);
 
   show_home_button_.Init(prefs::kShowHomeButton, profile->GetPrefs(), this);
 
   toolbar_ = gtk_hbox_new(FALSE, 0);
   gtk_container_set_border_width(GTK_CONTAINER(toolbar_), 4);
   // Demand we're always at least kToolbarHeight tall.
   // -1 for width means "let GTK do its normal sizing".
   gtk_widget_set_size_request(toolbar_, -1, kToolbarHeight);
   g_signal_connect(G_OBJECT(toolbar_), "expose-event",
-                   G_CALLBACK(&OnContentAreaExpose), this);
+                   G_CALLBACK(&OnToolbarExpose), this);
 
   // A GtkAccelGroup is not InitiallyUnowned, meaning we get a real reference
   // count starting at one.  We don't want the lifetime to be managed by the
   // top level window, since the lifetime should be tied to the C++ object.
   // When we add the accelerator group, the window will take a reference, but
   // we still hold on to the original, and thus own a reference to the group.
   accel_group_ = gtk_accel_group_new();
   gtk_window_add_accel_group(top_level_window, accel_group_);
 
   back_.reset(BuildBackForwardButton(IDR_BACK, IDR_BACK_P, IDR_BACK_H,
@@ skipping 196 matching lines @@
 
   gtk_widget_set_tooltip_text(button, localized_tooltip.c_str());
   g_signal_connect(G_OBJECT(button), "button-press-event",
                    G_CALLBACK(OnMenuButtonPressEvent), this);
   GTK_WIDGET_UNSET_FLAGS(button, GTK_CAN_FOCUS);
 
   gtk_box_pack_start(GTK_BOX(toolbar_), button, FALSE, FALSE, 0);
 }
 
 // static
-gboolean BrowserToolbarGtk::OnContentAreaExpose(GtkWidget* widget,
-                                                GdkEventExpose* e,
-                                                BrowserToolbarGtk* toolbar) {
-  // TODO(deanm): We should improve the tiling performance, or not use NineBox.
-  // For now at least honor the damage rect to avoid unnecessary painting.
+gboolean BrowserToolbarGtk::OnToolbarExpose(GtkWidget* widget,
+                                            GdkEventExpose* e,
+                                            BrowserToolbarGtk* toolbar) {
   cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(widget->window));
+  // It would be more intuitive to pass |e->area.y| rather than 0, but the
+  // toolbar is supposed to blend in with the active tab, so we have to pass
+  // coordinates for the IDR_THEME_TOOLBAR bitmap relative to the top of the
+  // tab strip. Since the toolbar's GdkWindow has the same origin as the tab
+  // strip's GdkWindow, we can just pass 0.
   toolbar->background_ninebox_.get()->RenderTopCenterStrip(cr,
-      e->area.x, -2, e->area.width);
+      e->area.x, 0, e->area.width);
   cairo_destroy(cr);
 
   return FALSE;  // Allow subwidgets to paint.
 }
 
 // static
 void BrowserToolbarGtk::OnButtonClick(GtkWidget* button,
                                       BrowserToolbarGtk* toolbar) {
   int tag = -1;
   if (button == toolbar->back_->widget())
@@ skipping 104 matching lines @@
 void BrowserToolbarGtk::RunAppMenu(GdkEvent* button_press_event) {
   app_menu_->Popup(app_menu_button_.get(), button_press_event);
 }
 
 CustomDrawButton* BrowserToolbarGtk::MakeHomeButton() {
   return BuildToolbarButton(IDR_HOME, IDR_HOME_P, IDR_HOME_H, 0,
                             l10n_util::GetStringUTF8(IDS_TOOLTIP_HOME));
 }
 
 void BrowserToolbarGtk::InitNineBox() {
+  // TODO(estade): use |profile_|?
   background_ninebox_.reset(new NineBox(
-      IDR_CONTENT_TOP_LEFT_CORNER,
-      IDR_CONTENT_TOP_CENTER,
-      IDR_CONTENT_TOP_RIGHT_CORNER,
-      IDR_CONTENT_LEFT_SIDE,
-      0,
-      IDR_CONTENT_RIGHT_SIDE,
-      IDR_CONTENT_BOTTOM_LEFT_CORNER,
-      IDR_CONTENT_BOTTOM_CENTER,
-      IDR_CONTENT_BOTTOM_RIGHT_CORNER));
+      browser_->profile()->GetThemeProvider(),
+      0, IDR_THEME_TOOLBAR, 0, 0, 0, 0, 0, 0, 0));
 }