chrome/browser/ui/gtk/menu_gtk.cc - Issue 7791004: linux: delete code that worked around gtk <2.18

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 7791004: linux: delete code that worked around gtk <2.18 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 9 years, 4 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:

Index: chrome/browser/ui/gtk/menu_gtk.cc

diff --git a/chrome/browser/ui/gtk/menu_gtk.cc b/chrome/browser/ui/gtk/menu_gtk.cc

index 9d762199b88466c0b5edc26e79a9f70c1e75e45b..3918ee6a15e5fa778f69d25ed0254acb984f049e 100644

--- a/chrome/browser/ui/gtk/menu_gtk.cc

+++ b/chrome/browser/ui/gtk/menu_gtk.cc

@@ -801,11 +801,7 @@ void MenuGtk::SetMenuItemInfo(GtkWidget* widget, gpointer userdata) {

gfx::ConvertAcceleratorsFromWindowsStyle(

UTF16ToUTF8(model->GetLabelAt(id)));

-#if GTK_CHECK_VERSION(2, 16, 0)

gtk_menu_item_set_label(GTK_MENU_ITEM(widget), label.c_str());

-#else

- gtk_label_set_label(GTK_LABEL(GTK_BIN(widget)->child), label.c_str());

-#endif

if (GTK_IS_IMAGE_MENU_ITEM(widget)) {

SkBitmap icon;

if (model->GetIconAt(id, &icon)) {