Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1122)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/gtk/menu_gtk.cc

Issue 159721: GTK: Show shortcuts in title bar context menu and tab context menu.... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/gtk/browser_window_gtk.cc ('k') | chrome/browser/gtk/tabs/tab_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/gtk/menu_gtk.cc
===================================================================
--- chrome/browser/gtk/menu_gtk.cc (revision 22106)
+++ chrome/browser/gtk/menu_gtk.cc (working copy)
@@ -125,7 +125,7 @@
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) {
@@ -166,7 +166,7 @@
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.
« no previous file with comments | « chrome/browser/gtk/browser_window_gtk.cc ('k') | chrome/browser/gtk/tabs/tab_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698