retry r2226, with a fix for a case where we could double free.

chrome/browser/gtk/bookmark_bubble_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/bookmark_bubble_gtk.h"
 
 #include <gtk/gtk.h>
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
@@ skipping 100 matching lines @@
       NotificationType::BOOKMARK_BUBBLE_HIDDEN,
       Source<Profile>(profile_->GetOriginalProfile()),
       NotificationService::NoDetails());
 }
 
 void BookmarkBubbleGtk::Observe(NotificationType type,
                                 const NotificationSource& source,
                                 const NotificationDetails& details) {
   DCHECK(type == NotificationType::BROWSER_THEME_CHANGED);
 
+  gtk_chrome_link_button_set_use_gtk_theme(
+      GTK_CHROME_LINK_BUTTON(remove_button_),
+      theme_provider_->UseGtkTheme());
+
   if (theme_provider_->UseGtkTheme()) {
     for (std::vector<GtkWidget*>::iterator it = labels_.begin();
          it != labels_.end(); ++it) {
       gtk_widget_modify_fg(*it, GTK_STATE_NORMAL, NULL);
     }
   } else {
     for (std::vector<GtkWidget*>::iterator it = labels_.begin();
          it != labels_.end(); ++it) {
       gtk_widget_modify_fg(*it, GTK_STATE_NORMAL, &gfx::kGdkBlack);
     }
@@ skipping 14 matching lines @@
       folder_combo_(NULL),
       bubble_(NULL),
       factory_(this),
       newly_bookmarked_(newly_bookmarked),
       apply_edits_(true),
       remove_bookmark_(false) {
   GtkWidget* label = gtk_label_new(l10n_util::GetStringUTF8(
       newly_bookmarked_ ? IDS_BOOMARK_BUBBLE_PAGE_BOOKMARKED :
                           IDS_BOOMARK_BUBBLE_PAGE_BOOKMARK).c_str());
   labels_.push_back(label);
-  GtkWidget* remove_button = gtk_chrome_link_button_new(
+  remove_button_ = gtk_chrome_link_button_new(
       l10n_util::GetStringUTF8(IDS_BOOMARK_BUBBLE_REMOVE_BOOKMARK).c_str());
   GtkWidget* edit_button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_BOOMARK_BUBBLE_OPTIONS).c_str());
   GtkWidget* close_button = gtk_button_new_with_label(
       l10n_util::GetStringUTF8(IDS_CLOSE).c_str());
 
   // Our content is arrange in 3 rows.  |top| contains a left justified
   // message, and a right justified remove link button.  |table| is the middle
   // portion with the name entry and the folder combo.  |bottom| is the final
   // row with a spacer, and the edit... and close buttons on the right.
   GtkWidget* content = gtk_vbox_new(FALSE, 5);
   GtkWidget* top = gtk_hbox_new(FALSE, 0);
 
   gtk_misc_set_alignment(GTK_MISC(label), 0, 1);
   gtk_box_pack_start(GTK_BOX(top), label,
                      TRUE, TRUE, 0);
-  gtk_box_pack_start(GTK_BOX(top), remove_button,
+  gtk_box_pack_start(GTK_BOX(top), remove_button_,
                      FALSE, FALSE, 0);
 
   // TODO(deanm): We should show the bookmark bar folder along with the top
   // other choices and an entry to go into the bookmark editor.  Since we don't
   // have the editor up yet on Linux, just show the bookmark bar for now.
   folder_combo_ = gtk_combo_box_new_text();
   folder_nodes_ = PopulateFolderCombo(profile_->GetBookmarkModel(),
                                       url_, folder_combo_);
 
   // Create the edit entry for updating the bookmark name / title.
@@ skipping 36 matching lines @@
   g_signal_connect(content, "destroy",
                    G_CALLBACK(&HandleDestroyThunk), this);
   g_signal_connect(name_entry_, "activate",
                    G_CALLBACK(&HandleNameActivateThunk), this);
   g_signal_connect(folder_combo_, "changed",
                    G_CALLBACK(&HandleFolderChangedThunk), this);
   g_signal_connect(edit_button, "clicked",
                    G_CALLBACK(&HandleEditButtonThunk), this);
   g_signal_connect(close_button, "clicked",
                    G_CALLBACK(&HandleCloseButtonThunk), this);
-  g_signal_connect(remove_button, "clicked",
+  g_signal_connect(remove_button_, "clicked",
                    G_CALLBACK(&HandleRemoveButtonThunk), this);
 
   registrar_.Add(this, NotificationType::BROWSER_THEME_CHANGED,
                  NotificationService::AllSources());
   theme_provider_->InitThemesFor(this);
 }
 
 BookmarkBubbleGtk::~BookmarkBubbleGtk() {
   DCHECK(!content_);  // |content_| should have already been destroyed.
 
@@ skipping 106 matching lines @@
   GtkWidget* toplevel = GTK_WIDGET(transient_toplevel_);
 
   // Close the bubble, deleting the C++ objects, etc.
   bubble_->Close();
 
   if (node) {
     BookmarkEditor::Show(toplevel, profile, NULL, node,
                          BookmarkEditor::SHOW_TREE, NULL);
   }
 }