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

chrome/browser/gtk/bookmark_bubble_gtk.h

 // 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.
 
 // This is the GTK implementation of the bookmark bubble, the dialog box
 // presented to create or edit a bookmark.  There can only ever be a single
 // bubble open, so the class presents only static methods, and handles the
 // singleton behavior for you.  It also handles the object and widget
 // lifetimes, destroying everything and possibly committing any changes when
 // the bubble is closed.
@@ skipping 108 matching lines @@
   // Provides colors and stuff.
   GtkThemeProvider* theme_provider_;
 
   // The toplevel window our dialogs should be transient for.
   GtkWindow* transient_toplevel_;
 
   // We let the InfoBubble own our content, and then we delete ourself
   // when the widget is destroyed (when the InfoBubble is destroyed).
   GtkWidget* content_;
 
+  // The button that removes the bookmark.
+  GtkWidget* remove_button_;
+
   // The various labels in the interface. We keep track of them for theme
   // changes.
   std::vector<GtkWidget*> labels_;
 
   // The GtkEntry for editing the bookmark name / title.
   GtkWidget* name_entry_;
 
   // The combo box for selecting the bookmark folder.
   GtkWidget* folder_combo_;
 
@@ skipping 11 matching lines @@
   // When closing the window, whether we should update or remove the bookmark.
   bool apply_edits_;
   bool remove_bookmark_;
 
   NotificationRegistrar registrar_;
 
   DISALLOW_COPY_AND_ASSIGN(BookmarkBubbleGtk);
 };
 
 #endif  // CHROME_BROWSER_GTK_BOOKMARK_BUBBLE_GTK_H_