Fix a crash that happens when changing themes.

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/resource_bundle.h"
 #include "app/theme_provider.h"
+#include "base/basictypes.h"
 #include "base/gfx/gtk_util.h"
 #include "base/gfx/point.h"
 #include "base/logging.h"
+#include "chrome/common/notification_service.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|.
@@ skipping 16 matching lines @@
   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 ?
-               theme_provider->GetPixbufNamed(top_left) : NULL;
-  images_[1] = top ?
-               theme_provider->GetPixbufNamed(top) : NULL;
-  images_[2] = top_right ?
-               theme_provider->GetPixbufNamed(top_right) : NULL;
-  images_[3] = left ?
-               theme_provider->GetPixbufNamed(left) : NULL;
-  images_[4] = center ?
-               theme_provider->GetPixbufNamed(center) : NULL;
-  images_[5] = right ?
-               theme_provider->GetPixbufNamed(right) : NULL;
-  images_[6] = bottom_left ?
-               theme_provider->GetPixbufNamed(bottom_left) : NULL;
-  images_[7] = bottom ?
-               theme_provider->GetPixbufNamed(bottom) : NULL;
-  images_[8] = bottom_right ?
-               theme_provider->GetPixbufNamed(bottom_right) : NULL;
+                 int right, int bottom_left, int bottom, int bottom_right)
+    : theme_provider_(theme_provider) {
+  image_ids_[0] = top_left;
+  image_ids_[1] = top;
+  image_ids_[2] = top_right;
+  image_ids_[3] = left;
+  image_ids_[4] = center;
+  image_ids_[5] = right;
+  image_ids_[6] = bottom_left;
+  image_ids_[7] = bottom;
+  image_ids_[8] = bottom_right;
+
+  // Load images by pretending that we got a BROWSER_THEME_CHANGED
+  // notification.
+  Observe(NotificationType::BROWSER_THEME_CHANGED,
+          NotificationService::AllSources(),
+          NotificationService::NoDetails());
+  registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
+                 NotificationService::AllSources());
 }
 
 NineBox::~NineBox() {
 }
 
 void NineBox::RenderToWidget(GtkWidget* dst) const {
   int dst_width = dst->allocation.width;
   int dst_height = dst->allocation.height;
 
   // The upper-left and lower-right corners of the center square in the
@@ skipping 93 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);
 }
+
+void NineBox::Observe(NotificationType type, const NotificationSource& source,
+                      const NotificationDetails& details) {
+  if (NotificationType::BROWSER_THEME_CHANGED != type) {
+    NOTREACHED();
+    return;
+  }
+
+  // Reload images.
+  for (size_t i = 0; i < arraysize(image_ids_); ++i) {
+    images_[i] = image_ids_[i] ?
+                 theme_provider_->GetPixbufNamed(image_ids_[i]) : NULL;
+  }
+}