summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 22:44:58 +0000
committerrohitrao@chromium.org <rohitrao@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-13 22:44:58 +0000
commit331d4e5867f145db72c40124caf106cee2a6b307 (patch)
treef3261255265b7da543bcc11589d8f686ef5b5edd /chrome/app
parentc9e0c73315f506226e07bd53a1a43162c79624f1 (diff)
downloadchromium_src-331d4e5867f145db72c40124caf106cee2a6b307.zip
chromium_src-331d4e5867f145db72c40124caf106cee2a6b307.tar.gz
chromium_src-331d4e5867f145db72c40124caf106cee2a6b307.tar.bz2
Revert 85330 - GTK: Bring global menu out of about:flags.
BUG=30213 TEST=memory bots, since they're now running w/ the code on. Review URL: http://codereview.chromium.org/6973037 TBR=erg@google.com Review URL: http://codereview.chromium.org/7011052 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85341 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/generated_resources.grd6
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 46c484a..ad453c9 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -4225,6 +4225,12 @@ Keep your key file in a safe place. You will need it to create new versions of y
<message name="IDS_FLAGS_PPAPI_FLASH_IN_PROCESS_DESCRIPTION" desc="Description for the flag to run the custom flash in-process">
If the PPAPI version of Flash is in use, run it in each renderer process rather than in a dedicated plugin process.
</message>
+ <message name="IDS_FLAGS_LINUX_GLOBAL_MENUBAR_NAME" desc="Title for the flag to show a global menu bar on linux.">
+ Experimental GNOME menu bar support.
+ </message>
+ <message name="IDS_FLAGS_LINUX_GLOBAL_MENUBAR_DESCRIPTION" desc="Description for the flag to show a global menu bar on linux.">
+ Newer versions of Unity and GNOME (including the upcoming Ubuntu Natty Narwhal) show an OSX style menubar across the top of the screen.
+ </message>
<message name="IDS_FLAGS_ENABLE_VPN_NAME" desc="Title for the flag to enable VPN support">
VPN support
</message>