Change SimpleMenuModel on OSX to support dynamic icons

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/menus/accelerator_gtk.h"
 #include "app/menus/button_menu_item_model.h"
@@ skipping 705 matching lines @@
 }
 
 // static
 void MenuGtk::SetButtonItemInfo(GtkWidget* button, gpointer userdata) {
   menus::ButtonMenuItemModel* model =
       reinterpret_cast<menus::ButtonMenuItemModel*>(
           g_object_get_data(G_OBJECT(button), "button-model"));
   int index = GPOINTER_TO_INT(g_object_get_data(
       G_OBJECT(button), "button-model-id"));
 
-  if (model->IsLabelDynamicAt(index)) {
+  if (model->IsItemDynamicAt(index)) {
     std::string label =
         gfx::ConvertAcceleratorsFromWindowsStyle(
             UTF16ToUTF8(model->GetLabelAt(index)));
     gtk_button_set_label(GTK_BUTTON(button), label.c_str());
   }
 
   gtk_widget_set_sensitive(GTK_WIDGET(button), model->IsEnabledAt(index));
 }
 
 // static
@@ skipping 38 matching lines @@
     gtk_custom_menu_item_foreach_button(GTK_CUSTOM_MENU_ITEM(widget),
                                         SetButtonItemInfo,
                                         userdata);
   }
 
   if (GTK_IS_MENU_ITEM(widget)) {
     gtk_widget_set_sensitive(widget, model->IsEnabledAt(id));
 
     if (model->IsVisibleAt(id)) {
       // Update the menu item label if it is dynamic.
-      if (model->IsLabelDynamicAt(id)) {
+      if (model->IsItemDynamicAt(id)) {

[Evan Stade, 2010/12/14 01:20:13]

add TODO re: images (also in the native_menu_* files)

[Andrew T Wilson (Slow), 2010/12/14 18:23:27]

Done.

BTW, where are the native_menu_* implementations used? For example, the
native_menu_win.cc file doesn't seem to dynamically update icons, but I've
verified that dynamic icons works just fine on the windows Wrench menu so I'm
assuming it uses a different implementation...

[Evan Stade, 2010/12/14 21:28:57]

I think that's because the common pattern is to just destroy and rebuild the
menu view from the menu model every time it's shown

         std::string label =
             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
       }
 
       gtk_widget_show(widget);
     } else {
       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);
     }
   }
 }