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

chrome/browser/ui/gtk/menu_gtk.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_GTK_MENU_GTK_H_
 #define CHROME_BROWSER_UI_GTK_MENU_GTK_H_
 #pragma once
 
 #include <gtk/gtk.h>
 
 #include <string>
 #include <vector>
 
 #include "base/task.h"
 #include "ui/base/gtk/gtk_signal.h"
+#include "ui/base/models/menu_model.h"
 #include "ui/gfx/point.h"
 
 class SkBitmap;
 
 namespace ui {
 class ButtonMenuItemModel;
-class MenuModel;
 }
 
-class MenuGtk {
+class MenuGtk : public ui::MenuModelDelegate {
  public:
   // Delegate class that lets another class control the status of the menu.
   class Delegate {
    public:
     virtual ~Delegate() { }
 
     // Called before a command is executed. This exists for the case where a
     // model is handling the actual execution of commands, but the delegate
     // still needs to know that some command got executed. This is called before
     // and not after the command is executed because its execution may delete
@@ skipping 55 matching lines @@
   void PopupAsContextForStatusIcon(guint32 event_time, guint32 button,
                                    GtkStatusIcon* icon);
 
   // Displays the menu following a keyboard event (such as selecting |widget|
   // and pressing "enter").
   void PopupAsFromKeyEvent(GtkWidget* widget);
 
   // Closes the menu.
   void Cancel();
 
+  // From ui::MenuModelDelegate, called when a favicon is loaded from history.
+  virtual void OnIconChanged(int model_index) OVERRIDE;
+
   // Repositions the menu to be right under the button.  Alignment is set as
   // object data on |void_widget| with the tag "left_align".  If "left_align"
   // is true, it aligns the left side of the menu with the left side of the
   // button. Otherwise it aligns the right side of the menu with the right side
   // of the button. Public since some menus have odd requirements that don't
   // belong in a public class.
   static void WidgetMenuPositionFunc(GtkMenu* menu,
                                      int* x,
                                      int* y,
                                      gboolean* push_in,
@@ skipping 48 matching lines @@
   // Sets the activating widget back to a normal appearance.
   CHROMEGTK_CALLBACK_0(MenuGtk, void, OnMenuHidden);
 
   // Sets the enable/disabled state and dynamic labels on our menu items.
   static void SetButtonItemInfo(GtkWidget* button, gpointer userdata);
 
   // Sets the check mark, enabled/disabled state and dynamic labels on our menu
   // items.
   static void SetMenuItemInfo(GtkWidget* widget, void* raw_menu);
 
+  // Update the icon for a particular menu_item (widget).
+  static void UpdateMenuIcon(GtkWidget* widget, gpointer userdata);
+
   // Queries this object about the menu state.
   MenuGtk::Delegate* delegate_;
 
   // If non-NULL, the MenuModel that we use to populate and control the GTK
   // menu (overriding the delegate as a controller).
   ui::MenuModel* model_;
 
   // For some menu items, we want to show the accelerator, but not actually
   // explicitly handle it. To this end we connect those menu items' accelerators
   // to this group, but don't attach this group to any top level window.
   GtkAccelGroup* dummy_accel_group_;
 
   // gtk_menu_popup() does not appear to take ownership of popup menus, so
   // MenuGtk explicitly manages the lifetime of the menu.
   GtkWidget* menu_;
 
   // True when we should ignore "activate" signals.  Used to prevent
   // menu items from getting activated when we are setting up the
   // menu.
   static bool block_activation_;
 
   // We must free these at shutdown.
   std::vector<MenuGtk*> submenus_we_own_;
 
   ScopedRunnableMethodFactory<MenuGtk> factory_;
 };
 
 #endif  // CHROME_BROWSER_UI_GTK_MENU_GTK_H_