diff options
| author | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 19:46:31 +0000 |
|---|---|---|
| committer | estade@chromium.org <estade@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-31 19:46:31 +0000 |
| commit | 8686d55defaefba169df8eb8c3cb264fae7baeca (patch) | |
| tree | df5c92bf4015e9ec7ac4ed3e6bba7eeb6c0d92e8 /chrome/browser/gtk/menu_gtk.cc | |
| parent | fb5153c5dd44a771be0cbd030a02eccf5cde76ed (diff) | |
| download | chromium_src-8686d55defaefba169df8eb8c3cb264fae7baeca.zip chromium_src-8686d55defaefba169df8eb8c3cb264fae7baeca.tar.gz chromium_src-8686d55defaefba169df8eb8c3cb264fae7baeca.tar.bz2 | |
GTK: Show shortcuts in title bar context menu and tab context menu.
BUG=17936
Review URL: http://codereview.chromium.org/159721
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22169 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/gtk/menu_gtk.cc')
| -rw-r--r-- | chrome/browser/gtk/menu_gtk.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc index f0a85d8..0063687 100644 --- a/chrome/browser/gtk/menu_gtk.cc +++ b/chrome/browser/gtk/menu_gtk.cc @@ -127,7 +127,7 @@ void MenuGtk::BuildMenuIn(GtkWidget* menu, if (menu_data->label_argument) { label = l10n_util::GetStringFUTF8( menu_data->label_id, - WideToUTF16(l10n_util::GetString(menu_data->label_argument))); + l10n_util::GetStringUTF16(menu_data->label_argument)); } else if (menu_data->label_id) { label = l10n_util::GetStringUTF8(menu_data->label_id); } else if (menu_data->type != MENU_SEPARATOR) { @@ -168,7 +168,7 @@ void MenuGtk::BuildMenuIn(GtkWidget* menu, menu_data->custom_submenu->menu_.get()); } - if (accel_group && menu_data->accel_key) { + if ((menu_data->only_show || accel_group) && menu_data->accel_key) { // If we ever want to let the user do any key remaping, we'll need to // change the following so we make a gtk_accel_map which keeps the actual // keys. |