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

ui/base/models/simple_menu_model.cc

Index: ui/base/models/simple_menu_model.cc
diff --git a/ui/base/models/simple_menu_model.cc b/ui/base/models/simple_menu_model.cc
index 6152766b3c5b548a8d9c6239bc29778aaca281f3..466ccf798ee89e4b71bc92cc7ec81328826549a6 100644
--- a/ui/base/models/simple_menu_model.cc
+++ b/ui/base/models/simple_menu_model.cc
@@ -245,7 +245,7 @@ int SimpleMenuModel::GetGroupIdAt(int index) const {
   return items_.at(FlipIndex(index)).group_id;
 }
 
-bool SimpleMenuModel::GetIconAt(int index, SkBitmap* icon) const {
+bool SimpleMenuModel::GetIconAt(int index, SkBitmap* icon) {
   if (IsItemDynamicAt(index))
     return delegate_->GetIconForCommandId(GetCommandIdAt(index), icon);
 
@@ -304,6 +304,9 @@ void SimpleMenuModel::OnMenuClosed() {
     delegate_->MenuClosed();
 }
 
+void SimpleMenuModel::SetDelegate(ui::MenuModel::Delegate* delegate) {
+}

[sky, 2011/02/22 18:28:28]

SimpleMenuModel should maintain the delegate as a field and provide a protected
accessor to it that is inlined.

[dill, 2011/02/25 15:16:43]

BackForwardMenuModel extends ui::MenuModel, not ui::SimpleMenuModel so it can't
use the field.

[sky, 2011/02/25 15:48:57]

I don't realize that. Have the implementation in both then.

+
 int SimpleMenuModel::FlipIndex(int index) const {
   return index;
 }