Gtk: fix reference counting/destruction of GtkMenu* in MenuGtk....

chrome/browser/gtk/menu_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/menu_gtk.h"
 
 #include "app/gfx/gtk_util.h"
 #include "app/l10n_util.h"
 #include "app/menus/accelerator_gtk.h"
 #include "app/menus/menu_model.h"
@@ skipping 10 matching lines @@
 bool MenuGtk::block_activation_ = false;
 
 MenuGtk::MenuGtk(MenuGtk::Delegate* delegate,
                  const MenuCreateMaterial* menu_data)
     : delegate_(delegate),
       model_(NULL),
       dummy_accel_group_(gtk_accel_group_new()),
       menu_(gtk_menu_new()),
       factory_(this) {
   DCHECK(menu_data);
+  g_object_ref_sink(menu_);
   ConnectSignalHandlers();
   BuildMenuIn(menu_, menu_data);
 }
 
 MenuGtk::MenuGtk(MenuGtk::Delegate* delegate)
     : delegate_(delegate),
       model_(NULL),
       dummy_accel_group_(gtk_accel_group_new()),
       menu_(gtk_menu_new()),
       factory_(this) {
+  g_object_ref_sink(menu_);
   ConnectSignalHandlers();
 }
 
 MenuGtk::MenuGtk(MenuGtk::Delegate* delegate,
                  menus::MenuModel* model)
     : delegate_(delegate),
       model_(model),
       dummy_accel_group_(gtk_accel_group_new()),
       menu_(gtk_menu_new()),
       factory_(this) {
+  g_object_ref_sink(menu_);
   DCHECK(model);
   ConnectSignalHandlers();
   if (model)
     BuildMenuFromModel();
 }
 
 MenuGtk::~MenuGtk() {
+  Cancel();
+  g_object_unref(menu_);
+
   STLDeleteContainerPointers(submenus_we_own_.begin(), submenus_we_own_.end());
   g_object_unref(dummy_accel_group_);
 }
 
 void MenuGtk::ConnectSignalHandlers() {
   // We connect afterwards because OnMenuShow calls SetMenuItemInfo, which may
   // take a long time or even start a nested message loop.
   g_signal_connect(menu_, "show", G_CALLBACK(OnMenuShow), this);
   g_signal_connect(menu_, "hide", G_CALLBACK(OnMenuHidden), this);
 }
@@ skipping 422 matching lines @@
   if (GTK_IS_MENU_ITEM(widget)) {
     gtk_widget_set_sensitive(widget, menu->IsCommandEnabled(model, id));
 
     GtkWidget* submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget));
     if (submenu) {
       gtk_container_foreach(GTK_CONTAINER(submenu), &SetMenuItemInfo,
                             userdata);
     }
   }
 }