summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--chrome/browser/gtk/find_bar_gtk.cc2
-rw-r--r--chrome/common/gtk_util.cc3
2 files changed, 3 insertions, 2 deletions
diff --git a/chrome/browser/gtk/find_bar_gtk.cc b/chrome/browser/gtk/find_bar_gtk.cc
index 0f5b6c7..6174791 100644
--- a/chrome/browser/gtk/find_bar_gtk.cc
+++ b/chrome/browser/gtk/find_bar_gtk.cc
@@ -99,7 +99,7 @@ void FindBarGtk::InitWidgets() {
// lateral position. We put that fixed in a SlideAnimatorGtk in order to get
// the slide effect.
GtkWidget* hbox = gtk_hbox_new(false, 0);
- container_ = gfx::CreateGtkBorderBin(hbox, &kBackgroundColor,
+ container_ = gfx::CreateGtkBorderBin(hbox, NULL,
kBarPaddingTopBottom, kBarPaddingTopBottom,
kEntryPaddingLeft, kBarPaddingRight);
gtk_widget_set_app_paintable(container_, TRUE);
diff --git a/chrome/common/gtk_util.cc b/chrome/common/gtk_util.cc
index fba765b..a12def3 100644
--- a/chrome/common/gtk_util.cc
+++ b/chrome/common/gtk_util.cc
@@ -66,7 +66,8 @@ GtkWidget* CreateGtkBorderBin(GtkWidget* child, const GdkColor* color,
// use a container border, since it won't paint there. Use an alignment
// inside to get the sizes exactly of how we want the border painted.
GtkWidget* ebox = gtk_event_box_new();
- gtk_widget_modify_bg(ebox, GTK_STATE_NORMAL, color);
+ if (color)
+ gtk_widget_modify_bg(ebox, GTK_STATE_NORMAL, color);
GtkWidget* alignment = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
gtk_alignment_set_padding(GTK_ALIGNMENT(alignment), top, bottom, left, right);
gtk_container_add(GTK_CONTAINER(alignment), child);