Retrieve favicons from history as NavigationEntries are converted from TabNav...

ui/base/models/simple_menu_model.h

Index: ui/base/models/simple_menu_model.h
diff --git a/ui/base/models/simple_menu_model.h b/ui/base/models/simple_menu_model.h
index 32490add498fe5c62d43cc330381ba8c0de2a9c1..60fe0e17594d9b71cb972fa0969d14c4d76487e3 100644
--- a/ui/base/models/simple_menu_model.h
+++ b/ui/base/models/simple_menu_model.h
@@ -112,7 +112,7 @@ class SimpleMenuModel : public MenuModel {
                                 ui::Accelerator* accelerator) const;
   virtual bool IsItemCheckedAt(int index) const;
   virtual int GetGroupIdAt(int index) const;
-  virtual bool GetIconAt(int index, SkBitmap* icon) const;
+  virtual bool GetIconAt(int index, SkBitmap* icon);
   virtual ui::ButtonMenuItemModel* GetButtonMenuItemAt(int index) const;
   virtual bool IsEnabledAt(int index) const;
   virtual bool IsVisibleAt(int index) const;
@@ -120,6 +120,7 @@ class SimpleMenuModel : public MenuModel {
   virtual void ActivatedAt(int index);
   virtual MenuModel* GetSubmenuModelAt(int index) const;
   virtual void MenuClosed();
+  virtual void SetDelegate(ui::MenuModel::Delegate* delegate);
 
  protected:
   // Some variants of this model (SystemMenuModel) relies on items to be