Merge lp:~attente/chromium-browser/chromium-browser into lp:~cmiller/chromium-browser/ppa-chromium-browser.raring.stable

[William Hua]

The global menu bar in Chromium is already a hack for Unity. It implements its Unity menu bar by creating an invisible GtkMenuBar and adding it to the widget hierarchy. But we should prefer to show the menu bar instead, with a size of 0x0.

While this is still a hack on top of another hack, it's still preferable until the appropriate fix is made. The appropriate fix is to export a GMenuModel and not create the GtkMenuBar at all.

(Also, see commit message)

Unmerged revisions

823. By William Hua on 2013-02-08

Make the menu bar visible, but taking zero space.

Before, an invisible menu bar was added to the widget hierarchy, but
never shown, for the sake of Unity. Instead we make it visible, but give
it zero space in the browser window UI layout.

The proper fix for the menu bar altogether is to export GMenuModels
directly and not add any GtkMenuBar at all.

=== added file 'debian/patches/menu-bar-visible.patch'
--- debian/patches/menu-bar-visible.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/menu-bar-visible.patch	2013-02-08 15:30:36 +0000
@@ -0,0 +1,28 @@
+Index: chromium-browser-24.0.1312.56/src/chrome/browser/ui/gtk/browser_window_gtk.cc
+===================================================================
+--- chromium-browser-24.0.1312.56.orig/src/chrome/browser/ui/gtk/browser_window_gtk.cc	2013-02-07 10:29:16.529640362 -0500
++++ chromium-browser-24.0.1312.56/src/chrome/browser/ui/gtk/browser_window_gtk.cc	2013-02-07 14:28:14.394185599 -0500
+@@ -1659,7 +1659,9 @@
+   // 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());
++  gtk_box_pack_start(GTK_BOX(window_vbox_), global_menu_bar_->widget(), FALSE,
++                     FALSE, 0);
++  gtk_widget_show(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);
+Index: chromium-browser-24.0.1312.56/src/chrome/browser/ui/gtk/global_menu_bar.cc
+===================================================================
+--- chromium-browser-24.0.1312.56.orig/src/chrome/browser/ui/gtk/global_menu_bar.cc	2013-02-07 10:29:16.529640362 -0500
++++ chromium-browser-24.0.1312.56/src/chrome/browser/ui/gtk/global_menu_bar.cc	2013-02-07 10:31:17.885644977 -0500
+@@ -161,7 +161,7 @@
+   // The global menu bar should never actually be shown in the app; it should
+   // instead remain in our widget hierarchy simply to be noticed by third party
+   // components.
+-  gtk_widget_set_no_show_all(menu_bar_.get(), TRUE);
++  gtk_widget_set_size_request(menu_bar_.get(), 0, 0);
+ 
+   // Set a nice name so it shows up in gtkparasite and others.
+   gtk_widget_set_name(menu_bar_.get(), "chrome-hidden-global-menubar");
 
=== modified file 'debian/patches/series'
--- debian/patches/series	2013-01-25 15:54:50 +0000
+++ debian/patches/series	2013-02-08 15:30:36 +0000
@@ -18,3 +18,4 @@
 7-npapi-permission-not-defaults-to-unauthorized.patch
 fix-1034541.patch
 ###: end lp:unity-chromium-extension
+menu-bar-visible.patch