gtk: Make GtkThemeProvider own the gtk label widget. The widget is not added...

chrome/browser/gtk/gtk_theme_provider.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/gtk_theme_provider.h"
 
 #include <gtk/gtk.h>
 
 #include "base/gfx/gtk_util.h"
 #include "chrome/browser/metrics/user_metrics.h"
@@ skipping 19 matching lines @@
 
 }  // namespace
 
 // static
 GtkThemeProvider* GtkThemeProvider::GetFrom(Profile* profile) {
   return static_cast<GtkThemeProvider*>(profile->GetThemeProvider());
 }
 
 GtkThemeProvider::GtkThemeProvider()
     : BrowserThemeProvider(),
-      fake_window_(gtk_window_new(GTK_WINDOW_TOPLEVEL)),
-      fake_label_(gtk_label_new("")) {
+      fake_window_(gtk_window_new(GTK_WINDOW_TOPLEVEL)) {
+  fake_label_.Own(gtk_label_new(""));
+
   // Only realized widgets receive style-set notifications, which we need to
   // broadcast new theme images and colors.
   gtk_widget_realize(fake_window_);
   g_signal_connect(fake_window_, "style-set", G_CALLBACK(&OnStyleSet), this);
 }
 
 GtkThemeProvider::~GtkThemeProvider() {
   profile()->GetPrefs()->RemovePrefObserver(prefs::kUsesSystemTheme, this);
   gtk_widget_destroy(fake_window_);
-  gtk_widget_destroy(fake_label_);
+  fake_label_.Destroy();
 
   // Disconnect from the destroy signal of any redisual widgets in
   // |chrome_buttons_|.
   for (std::vector<GtkWidget*>::iterator it = chrome_buttons_.begin();
        it != chrome_buttons_.end(); ++it) {
     gtk_signal_disconnect_by_data(GTK_OBJECT(*it), this);
   }
 }
 
 void GtkThemeProvider::Init(Profile* profile) {
@@ skipping 99 matching lines @@
                                   GtkThemeProvider* provider) {
   if (provider->profile()->GetPrefs()->GetBoolean(prefs::kUsesSystemTheme)) {
     provider->ClearAllThemeData();
     provider->LoadGtkValues();
     provider->NotifyThemeChanged();
   }
 }
 
 void GtkThemeProvider::LoadGtkValues() {
   GtkStyle* window_style = gtk_rc_get_style(fake_window_);
-  GtkStyle* label_style = gtk_rc_get_style(fake_label_);
+  GtkStyle* label_style = gtk_rc_get_style(fake_label_.get());
 
   SetThemeColorFromGtk(kColorFrame, &window_style->bg[GTK_STATE_SELECTED]);
   // Skip COLOR_FRAME_INACTIVE and the incognito colors, as they will be
   // autogenerated from tints.
   SetThemeColorFromGtk(kColorToolbar,
                        &window_style->bg[GTK_STATE_NORMAL]);
   SetThemeColorFromGtk(kColorTabText,
                        &label_style->text[GTK_STATE_NORMAL]);
   SetThemeColorFromGtk(kColorBackgroundTabText,
                        &label_style->text[GTK_STATE_NORMAL]);
@@ skipping 52 matching lines @@
 }
 
 void GtkThemeProvider::OnDestroyChromeButton(GtkWidget* button,
                                              GtkThemeProvider* provider) {
   std::vector<GtkWidget*>::iterator it =
       find(provider->chrome_buttons_.begin(), provider->chrome_buttons_.end(),
            button);
   if (it != provider->chrome_buttons_.end())
     provider->chrome_buttons_.erase(it);
 }