GTK: Fix highlight and image colors in the new wrench menu.

chrome/browser/gtk/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 "chrome/browser/gtk/menu_gtk.h"
 
 #include <map>
 
 #include "app/l10n_util.h"
 #include "app/menus/accelerator_gtk.h"
@@ skipping 74 matching lines @@
           UTF16ToUTF8(model->GetLabelAt(index)));
   gtk_button_set_label(GTK_BUTTON(button), label.c_str());
 }
 
 void SetupDynamicLabelMenuButton(GtkWidget* button,
                                  GtkWidget* menu,
                                  menus::ButtonMenuItemModel* model,
                                  int index) {
   if (model->IsLabelDynamicAt(index)) {
     g_object_set_data(G_OBJECT(button), "button-model",
-                      reinterpret_cast<void*>(model));
+                      model);
     g_object_set_data(G_OBJECT(button), "button-model-id",
                       GINT_TO_POINTER(index));
     g_signal_connect(menu, "show", G_CALLBACK(OnSubmenuShowButtonMenuItem),
                      button);
   }
 }
 
+void OnSubmenuShowButtonImage(GtkWidget* widget, GtkButton* button) {
+  MenuGtk::Delegate* delegate = reinterpret_cast<MenuGtk::Delegate*>(
+      g_object_get_data(G_OBJECT(button), "menu-gtk-delegate"));
+  int icon_idr = GPOINTER_TO_INT(g_object_get_data(
+      G_OBJECT(button), "button-image-idr"));
+
+  GtkIconSet* icon_set = delegate->GetIconSetForId(icon_idr);
+  if (icon_set) {
+    gtk_button_set_image(
+        button, gtk_image_new_from_icon_set(icon_set,
+                                            GTK_ICON_SIZE_MENU));
+  }
+}
+
+void SetupImageIcon(GtkWidget* button,
+                    GtkWidget* menu,
+                    int icon_idr,
+                    MenuGtk::Delegate* menu_gtk_delegate) {
+  g_object_set_data(G_OBJECT(button), "button-image-idr",
+                    GINT_TO_POINTER(icon_idr));
+  g_object_set_data(G_OBJECT(button), "menu-gtk-delegate",
+                    menu_gtk_delegate);
+
+  g_signal_connect(menu, "show", G_CALLBACK(OnSubmenuShowButtonImage), button);
+}
+
 // Popup menus may get squished if they open up too close to the bottom of the
 // screen. This function takes the size of the screen, the size of the menu,
 // an optional widget, the Y position of the mouse click, and adjusts the popup
 // menu's Y position to make it fit if it's possible to do so.
 // Returns the new Y position of the popup menu.
 int CalculateMenuYPosition(const GdkRectangle* screen_rect,
                            const GtkRequisition* menu_req,
                            const GtkWidget* widget, const int y) {
   CHECK(screen_rect);
   CHECK(menu_req);
@@ skipping 209 matching lines @@
     menus::AcceleratorGtk accelerator;
     if (model->GetAcceleratorAt(i, &accelerator)) {
       gtk_widget_add_accelerator(menu_item,
                                  "activate",
                                  dummy_accel_group_,
                                  accelerator.GetGdkKeyCode(),
                                  accelerator.gdk_modifier_type(),
                                  GTK_ACCEL_VISIBLE);
     }
 
-    g_object_set_data(G_OBJECT(menu_item), "model",
-                      reinterpret_cast<void*>(model));
+    g_object_set_data(G_OBJECT(menu_item), "model", model);
     AppendMenuItemToMenu(i, menu_item, menu, connect_to_activate);
 
     if (model->IsLabelDynamicAt(i)) {
       g_signal_connect(menu, "show", G_CALLBACK(OnSubmenuShow),
                        GINT_TO_POINTER(i));
     }
 
     menu_item = NULL;
   }
 }
 
 GtkWidget* MenuGtk::BuildButtomMenuItem(menus::ButtonMenuItemModel* model,
                                         GtkWidget* menu) {
   GtkWidget* menu_item = gtk_custom_menu_item_new(
       RemoveWindowsStyleAccelerators(UTF16ToUTF8(model->label())).c_str());
 
   // Set up the callback to the model for when it is clicked.
-  g_object_set_data(G_OBJECT(menu_item), "button-model",
-                    reinterpret_cast<void*>(model));
+  g_object_set_data(G_OBJECT(menu_item), "button-model", model);
   g_signal_connect(menu_item, "button-pushed",
                    G_CALLBACK(OnMenuButtonPressed), this);
 
   for (int i = 0; i < model->GetItemCount(); ++i) {
     switch (model->GetTypeAt(i)) {
       case menus::ButtonMenuItemModel::TYPE_SPACE: {
         gtk_custom_menu_item_add_space(GTK_CUSTOM_MENU_ITEM(menu_item));
         break;
       }
       case menus::ButtonMenuItemModel::TYPE_BUTTON: {
         GtkWidget* button = gtk_custom_menu_item_add_button(
             GTK_CUSTOM_MENU_ITEM(menu_item),
             model->GetCommandIdAt(i));
 
         int icon_idr;
         if (model->GetIconAt(i, &icon_idr)) {
-          // TODO(erg): This should go through the GtkThemeProvider so we can
-          // get a version tinted to label color.
-          gtk_button_set_image(
-              GTK_BUTTON(button),
-              gtk_image_new_from_pixbuf(
-                  ResourceBundle::GetSharedInstance().
-                  GetPixbufNamed(icon_idr)));
+          SetupImageIcon(button, menu, icon_idr, delegate_);
         } else {
           gtk_button_set_label(
               GTK_BUTTON(button),
               RemoveWindowsStyleAccelerators(
                   UTF16ToUTF8(model->GetLabelAt(i))).c_str());
         }
 
         SetupDynamicLabelMenuButton(button, menu, model, i);
         break;
       }
@@ skipping 180 matching lines @@
   if (GTK_IS_MENU_ITEM(widget)) {
     gtk_widget_set_sensitive(widget, model->IsEnabledAt(id));
 
     GtkWidget* submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget));
     if (submenu) {
       gtk_container_foreach(GTK_CONTAINER(submenu), &SetMenuItemInfo,
                             userdata);
     }
   }
 }