diff options
author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-14 22:33:56 +0000 |
---|---|---|
committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-14 22:33:56 +0000 |
commit | 5e462fe1c655f75f2336fb82ac9c683ba59c54b0 (patch) | |
tree | ca8b776024de58d70c4acdec8a83eaa64aa02b8f /chrome/browser/wrench_menu_model.cc | |
parent | a7a11c4145e62bab501bc61ef1f28a56539401b3 (diff) | |
download | chromium_src-5e462fe1c655f75f2336fb82ac9c683ba59c54b0.zip chromium_src-5e462fe1c655f75f2336fb82ac9c683ba59c54b0.tar.gz chromium_src-5e462fe1c655f75f2336fb82ac9c683ba59c54b0.tar.bz2 |
gtk: Use 'Preferences' instead of 'Options' in wrench menu.
BUG=17870
TEST=launch chrome, open the wrench menu, see if the 'Preferences' menu is in
there instead of the 'Options' menu.
Review URL: http://codereview.chromium.org/3060050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@56148 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/wrench_menu_model.cc')
-rw-r--r-- | chrome/browser/wrench_menu_model.cc | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/chrome/browser/wrench_menu_model.cc b/chrome/browser/wrench_menu_model.cc index d4b576f..7d3819a 100644 --- a/chrome/browser/wrench_menu_model.cc +++ b/chrome/browser/wrench_menu_model.cc @@ -12,6 +12,7 @@ #include "app/resource_bundle.h" #include "base/command_line.h" #include "base/string_number_conversions.h" +#include "base/string_util.h" #include "chrome/app/chrome_dll_resource.h" #include "chrome/browser/browser.h" #include "chrome/browser/browser_process.h" @@ -31,6 +32,10 @@ #include "grit/generated_resources.h" #include "grit/theme_resources.h" +#if defined(OS_LINUX) +#include <gtk/gtk.h> +#endif + //////////////////////////////////////////////////////////////////////////////// // EncodingMenuModel @@ -313,6 +318,14 @@ void WrenchMenuModel::Build() { #if defined(OS_MACOSX) AddItemWithStringId(IDC_OPTIONS, IDS_PREFERENCES_MAC); +#elif defined(OS_LINUX) + GtkStockItem stock_item; + if (gtk_stock_lookup(GTK_STOCK_PREFERENCES, &stock_item)) { + const char16 kUnderscore[] = { '_', 0 }; + string16 preferences; + RemoveChars(ASCIIToUTF16(stock_item.label), kUnderscore, &preferences); + AddItem(IDC_OPTIONS, preferences); + } #else AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS); #endif |