From a27d69a0f43bbad5fe7b0ed4ac55b24632b4143c Mon Sep 17 00:00:00 2001 From: "estade@chromium.org" Date: Tue, 5 Jan 2010 01:13:06 +0000 Subject: GTK: fix regression where MenuGtk::Delegate GetLabel() method was erroneously removed. got overzealous deleting code in r35389 BUG=31391 TEST=see bug git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35502 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/browser/gtk/menu_gtk.cc | 3 +++ 1 file changed, 3 insertions(+) (limited to 'chrome/browser/gtk/menu_gtk.cc') diff --git a/chrome/browser/gtk/menu_gtk.cc b/chrome/browser/gtk/menu_gtk.cc index 6437bb6..592d9d3 100644 --- a/chrome/browser/gtk/menu_gtk.cc +++ b/chrome/browser/gtk/menu_gtk.cc @@ -145,6 +145,9 @@ void MenuGtk::BuildMenuIn(GtkWidget* menu, 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) { + label = delegate_->GetLabel(menu_data->id); + DCHECK(!label.empty()); } label = ConvertAcceleratorsFromWindowsStyle(label); -- cgit v1.1