diff --git a/shell/browser/ui/gtk/menu_util.cc b/shell/browser/ui/gtk/menu_util.cc index 5870a85414..76bc5862f6 100644 --- a/shell/browser/ui/gtk/menu_util.cc +++ b/shell/browser/ui/gtk/menu_util.cc @@ -60,29 +60,23 @@ GdkModifierType GetGdkModifierForAccelerator( } // namespace -GtkWidget* BuildMenuItemWithImage(const std::string& label, GtkWidget* image) { -// GTK4 removed support for image menu items. +GtkWidget* BuildMenuItemWithImage(const std::string& label, + const gfx::Image& icon) { +// GTK4 removed support for menuitem icons. #if GTK_CHECK_VERSION(3, 90, 0) return gtk_menu_item_new_with_mnemonic(label.c_str()); #else G_GNUC_BEGIN_IGNORE_DEPRECATIONS; GtkWidget* menu_item = gtk_image_menu_item_new_with_mnemonic(label.c_str()); + GdkPixbuf* pixbuf = gtk_util::GdkPixbufFromSkBitmap(*icon.ToSkBitmap()); + GtkWidget* image = gtk_image_new_from_pixbuf(pixbuf); gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item), image); + g_object_unref(pixbuf); G_GNUC_END_IGNORE_DEPRECATIONS; return menu_item; #endif } -GtkWidget* BuildMenuItemWithImage(const std::string& label, - const gfx::Image& icon) { - GdkPixbuf* pixbuf = gtk_util::GdkPixbufFromSkBitmap(*icon.ToSkBitmap()); - - GtkWidget* menu_item = - BuildMenuItemWithImage(label, gtk_image_new_from_pixbuf(pixbuf)); - g_object_unref(pixbuf); - return menu_item; -} - GtkWidget* BuildMenuItemWithLabel(const std::string& label) { return gtk_menu_item_new_with_mnemonic(label.c_str()); } diff --git a/shell/browser/ui/gtk/menu_util.h b/shell/browser/ui/gtk/menu_util.h index 1958d9aaf2..11b1bd880d 100644 --- a/shell/browser/ui/gtk/menu_util.h +++ b/shell/browser/ui/gtk/menu_util.h @@ -26,8 +26,6 @@ using MenuActivatedCallback = base::RepeatingCallback; // Builds GtkImageMenuItems. GtkWidget* BuildMenuItemWithImage(const std::string& label, GtkWidget* image); -GtkWidget* BuildMenuItemWithImage(const std::string& label, - const gfx::Image& icon); GtkWidget* BuildMenuItemWithLabel(const std::string& label); ui::MenuModel* ModelForMenuItem(GtkMenuItem* menu_item);