views: Override gtk-menu-images=0 for menu items with icons.

views/controls/menu/native_menu_gtk.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "views/controls/menu/native_menu_gtk.h"
 
 #include <algorithm>
 #include <map>
 #include <string>
 
@@ skipping 335 matching lines @@
     case menus::MenuModel::TYPE_SUBMENU:
     case menus::MenuModel::TYPE_COMMAND: {
       SkBitmap icon;
       // Create menu item with icon if icon exists.
       if (model_->HasIcons() && model_->GetIconAt(index, &icon)) {
         menu_item = gtk_image_menu_item_new_with_mnemonic(label.c_str());
         GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&icon);
         gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item),
                                       gtk_image_new_from_pixbuf(pixbuf));
         g_object_unref(pixbuf);
+
+#if GTK_CHECK_VERSION(2,16,0)
+        // Show the image even if the "gtk-menu-images" setting is turned off.
+        gtk_image_menu_item_set_always_show_image(
+            GTK_IMAGE_MENU_ITEM(menu_item), TRUE);
+#endif
       } else {
         menu_item = gtk_menu_item_new_with_mnemonic(label.c_str());
       }
       break;
     }
     default:
       NOTREACHED();
       break;
   }
 
@@ skipping 186 matching lines @@
 #if !defined(OS_CHROMEOS)
 
 // static
 MenuWrapper* MenuWrapper::CreateWrapper(Menu2* menu) {
   return new NativeMenuGtk(menu);
 }
 
 #endif  // OS_CHROMEOS
 
 }  // namespace views