Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1871)

Unified Diff: chrome/browser/gtk/menu_gtk.h

Issue 48065: Ensure that MenuGtks are destroyed before their accelerator group. (Closed)
Patch Set: reinterpretcast Created 11 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/gtk/browser_toolbar_gtk.cc ('k') | chrome/browser/gtk/menu_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/menu_gtk.h
diff --git a/chrome/browser/gtk/menu_gtk.h b/chrome/browser/gtk/menu_gtk.h
index 216478a3a761f331537aa3109d11d708efa5a30c..f9060e11df52d08c6f41975007ec55a13247f260 100644
--- a/chrome/browser/gtk/menu_gtk.h
+++ b/chrome/browser/gtk/menu_gtk.h
@@ -60,7 +60,9 @@ class MenuGtk {
private:
// A recursive function that transforms a MenuCreateMaterial tree into a set
// of GtkMenuItems.
- void BuildMenuIn(GtkWidget* menu, const MenuCreateMaterial* menu_data);
+ void BuildMenuIn(GtkWidget* menu,
+ const MenuCreateMaterial* menu_data,
+ GtkAccelGroup* accel_group);
// A function that creates a GtkMenu from |delegate_|. This function is not
// recursive and does not support sub-menus.
@@ -91,9 +93,6 @@ class MenuGtk {
// Queries this object about the menu state.
MenuGtk::Delegate* delegate_;
- // Accelerator group to add keyboard accelerators to.
- GtkAccelGroup* accel_group_;
-
// gtk_menu_popup() does not appear to take ownership of popup menus, so
// MenuGtk explicitly manages the lifetime of the menu.
OwnedWidgetGtk menu_;
« no previous file with comments | « chrome/browser/gtk/browser_toolbar_gtk.cc ('k') | chrome/browser/gtk/menu_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698