Assertion failure fix

views/controls/menu/native_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 "views/controls/menu/native_menu_gtk.h"
 
 #include <string>
 
 #include "app/gfx/gtk_util.h"
 #include "base/keyboard_codes.h"
@@ skipping 68 matching lines @@
 // NativeMenuGtk, MenuWrapper implementation:
 
 void NativeMenuGtk::RunMenuAt(const gfx::Point& point, int alignment) {
   Position position = { point, static_cast<Menu2::Alignment>(alignment) };
   // TODO(beng): value of '1' will not work for context menus!
   gtk_menu_popup(GTK_MENU(menu_), NULL, NULL, MenuPositionFunc, &position, 1,
                  gtk_get_current_event_time());
 
   DCHECK(!menu_shown_);
   menu_shown_ = true;
+  // Listen for "hide" signal so that we know when to return from the blocking
+  // RunMenuAt call.
+  gint handle_id =
+      g_signal_connect(G_OBJECT(menu_), "hide", G_CALLBACK(OnMenuHidden), this);
 
   // Block until menu is no longer shown by running a nested message loop.
   MessageLoopForUI::current()->Run(NULL);
 
+  g_signal_handler_disconnect(G_OBJECT(menu_), handle_id);
   menu_shown_ = false;
 }
 
 void NativeMenuGtk::CancelMenu() {
   NOTIMPLEMENTED();
 }
 
 void NativeMenuGtk::Rebuild() {
   ResetMenu();
 
@@ skipping 113 matching lines @@
         submenu->UpdateStates();
     }
   }
   ++usd->index;
 }
 
 void NativeMenuGtk::ResetMenu() {
   if (menu_)
     gtk_widget_destroy(menu_);
   menu_ = gtk_menu_new();
-  // Listen for "hide" signal so that we know when to return from the blocking
-  // RunMenuAt call.
-  g_signal_connect(G_OBJECT(menu_), "hide", G_CALLBACK(OnMenuHidden), this);
 }
 
 // static
 void NativeMenuGtk::MenuPositionFunc(GtkMenu* menu,
                                      int* x,
                                      int* y,
                                      gboolean* push_in,
                                      void* data) {
   Position* position = reinterpret_cast<Position*>(data);
   // TODO(beng): RTL
@@ skipping 24 matching lines @@
 
 ////////////////////////////////////////////////////////////////////////////////
 // MenuWrapper, public:
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   return new NativeMenuGtk(menu->model());
 }
 
 }  // namespace views