Native menu implementation for bug 5679. Followup to http://codereview.chromium.org/2928005/

chrome/browser/ui/gtk/menu_gtk.cc

 // Copyright (c) 2011 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/ui/gtk/menu_gtk.h"
 
 #include <map>
 
 #include "base/i18n/rtl.h"
 #include "base/logging.h"
@@ skipping 266 matching lines @@
 MenuGtk::MenuGtk(MenuGtk::Delegate* delegate,
                  ui::MenuModel* model)
     : delegate_(delegate),
       model_(model),
       dummy_accel_group_(gtk_accel_group_new()),
       menu_(gtk_custom_menu_new()),
       factory_(this) {
   DCHECK(model);
   g_object_ref_sink(menu_);
   ConnectSignalHandlers();
+  model->SetMenuModelDelegate(this);
   BuildMenuFromModel();
 }
 
 MenuGtk::~MenuGtk() {
   Cancel();
 
   gtk_widget_destroy(menu_);
   g_object_unref(menu_);
 
   STLDeleteContainerPointers(submenus_we_own_.begin(), submenus_we_own_.end());
@@ skipping 96 matching lines @@
 
 void MenuGtk::PopupAsFromKeyEvent(GtkWidget* widget) {
   PopupForWidget(widget, 0, gtk_get_current_event_time());
   gtk_menu_shell_select_first(GTK_MENU_SHELL(menu_), FALSE);
 }
 
 void MenuGtk::Cancel() {
   gtk_menu_popdown(GTK_MENU(menu_));
 }
 
+void MenuGtk::OnIconChanged(int model_index) {
+  gtk_container_foreach(GTK_CONTAINER(menu_), UpdateMenuIcon, &model_index);
+}
+
 void MenuGtk::UpdateMenu() {
   gtk_container_foreach(GTK_CONTAINER(menu_), SetMenuItemInfo, this);
 }
 
 GtkWidget* MenuGtk::BuildMenuItemWithImage(const std::string& label,
                                   GtkWidget* image) {
   GtkWidget* menu_item =
       gtk_image_menu_item_new_with_mnemonic(label.c_str());
   gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(menu_item), image);
   return menu_item;
@@ skipping 220 matching lines @@
       delegate_->CommandWillBeExecuted();
 
     model->ActivatedCommand(command_id);
     pressed = TRUE;
   }
 
   return pressed;
 }
 
 // static
+void MenuGtk::UpdateMenuIcon(GtkWidget* widget, gpointer userdata) {
+  if (GTK_IS_MENU_ITEM(widget)) {
+    int model_index = *static_cast<int*>(userdata);
+    int menu_id;
+    GetMenuItemID(widget, &menu_id);
+    if (menu_id != model_index) {
+      return;
+    }
+    SkBitmap icon;
+    ui::MenuModel* model = ModelForMenuItem(GTK_MENU_ITEM(widget));
+    if (model->GetIconAt(model_index, &icon)) {
+      GdkPixbuf* pixbuf = gfx::GdkPixbufFromSkBitmap(&icon);
+      gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(widget),
+                                    gtk_image_new_from_pixbuf(pixbuf));
+      g_object_unref(pixbuf);
+    }
+  }
+}
+
+// static
 void MenuGtk::WidgetMenuPositionFunc(GtkMenu* menu,
                                      int* x,
                                      int* y,
                                      gboolean* push_in,
                                      void* void_widget) {
   GtkWidget* widget = GTK_WIDGET(void_widget);
   GtkRequisition menu_req;
 
   gtk_widget_size_request(GTK_WIDGET(menu), &menu_req);
 
@@ skipping 170 matching lines @@
       gtk_widget_hide(widget);
     }
 
     GtkWidget* submenu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(widget));
     if (submenu) {
       gtk_container_foreach(GTK_CONTAINER(submenu), &SetMenuItemInfo,
                             userdata);
     }
   }
 }