diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 01:16:51 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-11-24 01:16:51 +0000 |
| commit | 5a3ed90a6cde8e81d4cd577dd56f6b8c26f5807e (patch) | |
| tree | b219ad7ca858e6efb5b15826a8082a5224ebc3bf /chrome/browser/gtk/menu_bar_helper.h | |
| parent | 19d57619949a9c224ebacc5c65a8ae750f09af36 (diff) | |
| download | chromium_src-5a3ed90a6cde8e81d4cd577dd56f6b8c26f5807e.zip chromium_src-5a3ed90a6cde8e81d4cd577dd56f6b8c26f5807e.tar.gz chromium_src-5a3ed90a6cde8e81d4cd577dd56f6b8c26f5807e.tar.bz2 | |
[GTK] prevent MenuBarHelper from referencing stale widget.
Menus can be destroyed without being hidden, so connect to the "destroy" signal as well as "hide". This fixes the crash, and makes the class more robust in the future.
Also, manually hide the bookmark menu widget when destroyed it in BookmarkMenuController. This gets the bbar button paint state correct.
BUG=63294
TEST=manual (see bug)
Review URL: http://codereview.chromium.org/5298002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@67194 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/menu_bar_helper.h')
| -rw-r--r-- | chrome/browser/gtk/menu_bar_helper.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/chrome/browser/gtk/menu_bar_helper.h b/chrome/browser/gtk/menu_bar_helper.h index 286b669..e6f0ef4 100644 --- a/chrome/browser/gtk/menu_bar_helper.h +++ b/chrome/browser/gtk/menu_bar_helper.h @@ -48,9 +48,9 @@ class MenuBarHelper { void Clear(); private: + CHROMEGTK_CALLBACK_0(MenuBarHelper, void, OnMenuHiddenOrDestroyed); CHROMEGTK_CALLBACK_1(MenuBarHelper, gboolean, OnMenuMotionNotify, GdkEventMotion*); - CHROMEGTK_CALLBACK_0(MenuBarHelper, void, OnMenuHidden); CHROMEGTK_CALLBACK_1(MenuBarHelper, void, OnMenuMoveCurrent, GtkMenuDirectionType); |