Ensure that MenuGtks are destroyed before their accelerator group.

chrome/browser/gtk/browser_toolbar_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/browser_toolbar_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include "base/logging.h"
 #include "base/base_paths_linux.h"
@@ skipping 30 matching lines @@
   browser_->command_updater()->AddCommandObserver(IDC_HOME, this);
   browser_->command_updater()->AddCommandObserver(IDC_STAR, this);
 
   back_menu_model_.reset(new BackForwardMenuModelGtk(
       browser, BackForwardMenuModel::BACKWARD_MENU_DELEGATE));
   forward_menu_model_.reset(new BackForwardMenuModelGtk(
       browser, BackForwardMenuModel::FORWARD_MENU_DELEGATE));
 }
 
 BrowserToolbarGtk::~BrowserToolbarGtk() {
+  // When we created our MenuGtk objects, we pass them a pointer to our accel
+  // group.  Make sure to tear them down before |accel_group_|.
+  page_menu_.reset();
+  app_menu_.reset();
+  back_forward_menu_.reset();
+  g_object_unref(accel_group_);
 }
 
 void BrowserToolbarGtk::Init(Profile* profile,
                              GtkWindow* top_level_window) {
   // Make sure to tell the location bar the profile before calling its Init.
   SetProfile(profile);
 
   show_home_button_.Init(prefs::kShowHomeButton, profile->GetPrefs(), this);
 
   toolbar_ = gtk_hbox_new(FALSE, 0);
   gtk_container_set_border_width(GTK_CONTAINER(toolbar_), 4);
   // Demand we're always at least kToolbarHeight tall.
   // -1 for width means "let GTK do its normal sizing".
   gtk_widget_set_size_request(toolbar_, -1, kToolbarHeight);
 
+  // A GtkAccelGroup is not InitiallyUnowned, meaning we get a real reference
+  // count starting at one.  We don't want the lifetime to be managed by the
+  // top level window, since the lifetime should be tied to the C++ object.
+  // When we add the accelerator group, the window will take a reference, but
+  // we still hold on to the original, and thus own a reference to the group.
   accel_group_ = gtk_accel_group_new();
   gtk_window_add_accel_group(top_level_window, accel_group_);
-  // Drop the initial ref on |accel_group_| so that |top_level_window| will own
-  // it.
-  g_object_unref(accel_group_);
 
   toolbar_tooltips_ = gtk_tooltips_new();
 
   back_.reset(BuildBackForwardButton(IDR_BACK, IDR_BACK_P, IDR_BACK_H,
               IDR_BACK_D,
               l10n_util::GetString(IDS_TOOLTIP_BACK)));
   AddAcceleratorToButton(back_, GDK_Left, GDK_MOD1_MASK);
   forward_.reset(BuildBackForwardButton(IDR_FORWARD, IDR_FORWARD_P,
                  IDR_FORWARD_H, IDR_FORWARD_D,
                  l10n_util::GetString(IDS_TOOLTIP_FORWARD)));
@@ skipping 270 matching lines @@
 }
 
 void BrowserToolbarGtk::RunAppMenu(GdkEvent* button_press_event) {
   app_menu_->Popup(app_menu_button_->widget(), button_press_event);
 }
 
 CustomDrawButton* BrowserToolbarGtk::MakeHomeButton() {
   return BuildToolbarButton(IDR_HOME, IDR_HOME_P, IDR_HOME_H, 0,
                             l10n_util::GetString(IDS_TOOLTIP_HOME));
 }