Revert 85330 - GTK: Bring global menu out of about:flags.

chrome/browser/ui/gtk/browser_window_gtk.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/gtk/browser_window_gtk.h"
 
 #include <gdk/gdkkeysyms.h>
 
 #include <dlfcn.h>
 #include <string>
@@ skipping 1589 matching lines @@
 
   // This vbox encompasses all of the widgets within the browser.  This is
   // everything except the custom frame border.
   window_vbox_ = gtk_vbox_new(FALSE, 0);
   gtk_widget_show(window_vbox_);
 
   // We hold an always hidden GtkMenuBar inside our browser window simply to
   // 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.)
-  global_menu_bar_.reset(new GlobalMenuBar(browser_.get()));
-  gtk_container_add(GTK_CONTAINER(window_vbox_), global_menu_bar_->widget());
+  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());
+  }
 
   // The window container draws the custom browser frame.
   window_container_ = gtk_alignment_new(0.0, 0.0, 1.0, 1.0);
   gtk_widget_set_name(window_container_, "chrome-custom-frame-border");
   gtk_widget_set_app_paintable(window_container_, TRUE);
   gtk_widget_set_double_buffered(window_container_, FALSE);
   gtk_widget_set_redraw_on_allocate(window_container_, TRUE);
   g_signal_connect(window_container_, "expose-event",
                    G_CALLBACK(OnCustomFrameExposeThunk), this);
   gtk_container_add(GTK_CONTAINER(window_container_), window_vbox_);
@@ skipping 745 matching lines @@
   // are taken from the WMs' source code.
   return (wm_name == "Blackbox" ||
           wm_name == "compiz" ||
           wm_name == "Compiz" ||
           wm_name == "e16" ||  // Enlightenment DR16
           wm_name == "Metacity" ||
           wm_name == "Mutter" ||
           wm_name == "Openbox" ||
           wm_name == "Xfwm4");
 }