summaryrefslogtreecommitdiffstats
path: root/chrome/browser/gtk/menu_gtk.h
diff options
context:
space:
mode:
authordeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-16 18:30:47 +0000
committerdeanm@chromium.org <deanm@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-03-16 18:30:47 +0000
commitc0b99038c58d79f7c1032f35dfb0eb62279a2d0d (patch)
tree92fbe908e564e72c45d206298a80236340a1034a /chrome/browser/gtk/menu_gtk.h
parent027ec5f2dc1e9a26aea297623f1784592de7d562 (diff)
downloadchromium_src-c0b99038c58d79f7c1032f35dfb0eb62279a2d0d.zip
chromium_src-c0b99038c58d79f7c1032f35dfb0eb62279a2d0d.tar.gz
chromium_src-c0b99038c58d79f7c1032f35dfb0eb62279a2d0d.tar.bz2
Move a bunch of our GTK code that was previous manually handling references (and often doing it incorrect / leaking) to use an OwnedWidgetGtk.
Review URL: http://codereview.chromium.org/48007 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@11750 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/menu_gtk.h')
-rw-r--r--chrome/browser/gtk/menu_gtk.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/chrome/browser/gtk/menu_gtk.h b/chrome/browser/gtk/menu_gtk.h
index 01bdc78..216478a 100644
--- a/chrome/browser/gtk/menu_gtk.h
+++ b/chrome/browser/gtk/menu_gtk.h
@@ -9,6 +9,7 @@
#include <string>
#include "chrome/browser/gtk/standard_menus.h"
+#include "chrome/common/owned_widget_gtk.h"
class SkBitmap;
@@ -93,12 +94,9 @@ class MenuGtk {
// Accelerator group to add keyboard accelerators to.
GtkAccelGroup* accel_group_;
- // The window this menu is attached to.
- GtkWindow* window_;
-
// gtk_menu_popup() does not appear to take ownership of popup menus, so
// MenuGtk explicitly manages the lifetime of the menu.
- GtkWidget* menu_;
+ OwnedWidgetGtk menu_;
};
#endif // CHROME_BROWSER_GTK_MENU_GTK_H_