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

chrome/browser/gtk/nine_box.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/nine_box.h"
 
+#include "app/gfx/gtk_util.h"
 #include "app/resource_bundle.h"
+#include "app/theme_provider.h"
 #include "base/gfx/gtk_util.h"
 #include "base/gfx/point.h"
 #include "base/logging.h"
 
 namespace {
 
 // Draw pixbuf |src| into |dst| at position (x, y).
 void DrawPixbuf(cairo_t* cr, GdkPixbuf* src, int x, int y) {
   gdk_cairo_set_source_pixbuf(cr, src, x, y);
   cairo_paint(cr);
 }
 
 // Tile pixbuf |src| across |cr| at |x|, |y| for |width| and |height|.
 void TileImage(cairo_t* cr, GdkPixbuf* src,
                int x, int y, int width, int height) {
   gdk_cairo_set_source_pixbuf(cr, src, x, y);
   cairo_pattern_set_extend(cairo_get_source(cr), CAIRO_EXTEND_REPEAT);
   cairo_rectangle(cr, x, y, width, height);
   cairo_fill(cr);
 }
 
+GdkPixbuf* GetPixbufNamed(ThemeProvider* theme_provider, int name) {
+  return gfx::GdkPixbufFromSkBitmap(theme_provider->GetBitmapNamed(name));
+}
+
 }  // namespace
 
 NineBox::NineBox(int top_left, int top, int top_right, int left, int center,
                  int right, int bottom_left, int bottom, int bottom_right) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   images_[0] = top_left ? rb.GetPixbufNamed(top_left) : NULL;
   images_[1] = top ? rb.GetPixbufNamed(top) : NULL;
   images_[2] = top_right ? rb.GetPixbufNamed(top_right) : NULL;
   images_[3] = left ? rb.GetPixbufNamed(left) : NULL;
   images_[4] = center ? rb.GetPixbufNamed(center) : NULL;
   images_[5] = right ? rb.GetPixbufNamed(right) : NULL;
   images_[6] = bottom_left ? rb.GetPixbufNamed(bottom_left) : NULL;
   images_[7] = bottom ? rb.GetPixbufNamed(bottom) : NULL;
   images_[8] = bottom_right ? rb.GetPixbufNamed(bottom_right) : NULL;
 }
 
+NineBox::NineBox(ThemeProvider* theme_provider,
+                 int top_left, int top, int top_right, int left, int center,
+                 int right, int bottom_left, int bottom, int bottom_right) {
+  images_[0] = top_left ?
+               GetPixbufNamed(theme_provider, top_left) : NULL;
+  images_[1] = top ?
+               GetPixbufNamed(theme_provider, top) : NULL;
+  images_[2] = top_right ?
+               GetPixbufNamed(theme_provider, top_right) : NULL;
+  images_[3] = left ?
+               GetPixbufNamed(theme_provider, left) : NULL;
+  images_[4] = center ?
+               GetPixbufNamed(theme_provider, center) : NULL;
+  images_[5] = right ?
+               GetPixbufNamed(theme_provider, right) : NULL;
+  images_[6] = bottom_left ?
+               GetPixbufNamed(theme_provider, bottom_left) : NULL;
+  images_[7] = bottom ?
+               GetPixbufNamed(theme_provider, bottom) : NULL;
+  images_[8] = bottom_right ?
+               GetPixbufNamed(theme_provider, bottom_right) : NULL;
+}
+
 NineBox::~NineBox() {
 }
 
 void NineBox::RenderToWidget(GtkWidget* dst) const {
   int dst_width = dst->allocation.width;
   int dst_height = dst->allocation.height;
 
   cairo_t* cr = gdk_cairo_create(GDK_DRAWABLE(dst->window));
   // For widgets that have their own window, the allocation (x,y) coordinates
   // are GdkWindow relative. For other widgets, the coordinates are relative
@@ skipping 85 matching lines @@
   cairo_t* cr = gdk_cairo_create(mask);
   cairo_rectangle(cr, x1, 0, x2 - x1, widget->allocation.height);
   cairo_fill(cr);
 
   // Mask the widget's window's shape.
   gtk_widget_shape_combine_mask(widget, mask, 0, 0);
 
   g_object_unref(mask);
   cairo_destroy(cr);
 }