chrome/browser/ui/gtk/global_menu_bar.h - Issue 7017028: Revert "Revert 85330 - GTK: Bring global menu out of about:flags."

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/gtk/global_menu_bar.h

Issue 7017028: Revert "Revert 85330 - GTK: Bring global menu out of about:flags." (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase Created 9 years, 7 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:

Index: chrome/browser/ui/gtk/global_menu_bar.h

diff --git a/chrome/browser/ui/gtk/global_menu_bar.h b/chrome/browser/ui/gtk/global_menu_bar.h

index 1364e51a27df2035120964de1c39d89245573c62..b375e5732d6723f6d425056fcaf7b5ddc475b1b5 100644

--- a/chrome/browser/ui/gtk/global_menu_bar.h

+++ b/chrome/browser/ui/gtk/global_menu_bar.h

@@ -17,6 +17,7 @@

class Browser;

struct GlobalMenuBarCommand;

+class GlobalMenuOwner;

typedef struct _GtkAccelGroup GtkAccelGroup;

typedef struct _GtkWidget GtkWidget;

@@ -48,9 +49,10 @@ class GlobalMenuBar : public CommandUpdater::CommandObserver,

typedef std::map<int, GtkWidget*> CommandIDMenuItemMap;

// Helper function that builds the data.

- GtkWidget* BuildGtkMenuFrom(int menu_str_id,

- std::map<int, GtkWidget*>* id_to_menu_item,

- GlobalMenuBarCommand* commands);

+ void BuildGtkMenuFrom(int menu_str_id,

+ std::map<int, GtkWidget*>* id_to_menu_item,

+ GlobalMenuBarCommand* commands,

+ GlobalMenuOwner* owner);

// Builds an individual menu item.

GtkWidget* BuildMenuItem(int string_id,