diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-30 23:56:15 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-09-30 23:56:15 +0000 |
| commit | 6debdd4b159057619e9b53b975b335796aa163a5 (patch) | |
| tree | a32451f4024b6ccd889ae2668ddfc04ec15b347f /chrome/browser/gtk/menu_gtk.h | |
| parent | ba28602ec8163bce988c0738b1b594652a81a298 (diff) | |
| download | chromium_src-6debdd4b159057619e9b53b975b335796aa163a5.zip chromium_src-6debdd4b159057619e9b53b975b335796aa163a5.tar.gz chromium_src-6debdd4b159057619e9b53b975b335796aa163a5.tar.bz2 | |
GTK: Fix memory leak from r27666.
Make MenuGtk take ownership of submenus.
BUG=none
TEST=valgrind doesn't complain
Review URL: http://codereview.chromium.org/251053
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27689 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/menu_gtk.h')
| -rw-r--r-- | chrome/browser/gtk/menu_gtk.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/chrome/browser/gtk/menu_gtk.h b/chrome/browser/gtk/menu_gtk.h index f0dc661..8baf3002 100644 --- a/chrome/browser/gtk/menu_gtk.h +++ b/chrome/browser/gtk/menu_gtk.h @@ -8,6 +8,7 @@ #include <gtk/gtk.h> #include <string> +#include <vector> #include "base/task.h" #include "chrome/common/owned_widget_gtk.h" @@ -150,6 +151,9 @@ class MenuGtk { // menu. static bool block_activation_; + // We must free these at shutdown. + std::vector<MenuGtk*> submenus_we_own_; + ScopedRunnableMethodFactory<MenuGtk> factory_; }; |