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

Unified Diff: chrome/browser/ui/gtk/browser_window_gtk.cc

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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/gtk/global_bookmark_menu.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/browser_window_gtk.cc
diff --git a/chrome/browser/ui/gtk/browser_window_gtk.cc b/chrome/browser/ui/gtk/browser_window_gtk.cc
index cdb8b012803254859375cfe9a407a095bb3b6113..ff48ba5e27254a521682daf489972a10957af4dd 100644
--- a/chrome/browser/ui/gtk/browser_window_gtk.cc
+++ b/chrome/browser/ui/gtk/browser_window_gtk.cc
@@ -1611,10 +1611,8 @@ void BrowserWindowGtk::InitWidgets() {
// fool the Unity desktop, which will mirror the contents of the first
// GtkMenuBar it sees into the global menu bar. (It doesn't seem to check the
// visibility of the GtkMenuBar, so we can just permanently hide it.)
- if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kGlobalGnomeMenu)) {
- global_menu_bar_.reset(new GlobalMenuBar(browser_.get()));
- gtk_container_add(GTK_CONTAINER(window_vbox_), global_menu_bar_->widget());
- }
+ global_menu_bar_.reset(new GlobalMenuBar(browser_.get()));
+ gtk_container_add(GTK_CONTAINER(window_vbox_), global_menu_bar_->widget());
// The window container draws the custom browser frame.
window_container_ = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/ui/gtk/global_bookmark_menu.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698