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

ui/base/models/simple_menu_model.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 "ui/base/models/simple_menu_model.h"
 
 #include "base/message_loop.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/l10n/l10n_util.h"
 
@@ skipping 227 matching lines @@
   int item_index = FlipIndex(index);
   MenuModel::ItemType item_type = items_[item_index].type;
   return (item_type == TYPE_CHECK || item_type == TYPE_RADIO) ?
       delegate_->IsCommandIdChecked(GetCommandIdAt(index)) : false;
 }
 
 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);
 
   if (items_[index].icon.isNull())
     return false;
 
   *icon = items_[index].icon;
   return true;
 }
 
@@ skipping 38 matching lines @@
   MessageLoop::current()->PostTask(
       FROM_HERE,
       method_factory_.NewRunnableMethod(&SimpleMenuModel::OnMenuClosed));
 }
 
 void SimpleMenuModel::OnMenuClosed() {
   if (delegate_)
     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;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleMenuModel, Private:
 
 void SimpleMenuModel::AppendItem(const Item& item) {
   ValidateItem(item);
   items_.push_back(item);
 }
 
 void SimpleMenuModel::InsertItemAtIndex(const Item& item, int index) {
   ValidateItem(item);
   items_.insert(items_.begin() + FlipIndex(index), item);
 }
 
 void SimpleMenuModel::ValidateItem(const Item& item) {
 #ifndef NDEBUG
   if (item.type == TYPE_SEPARATOR) {
     DCHECK_EQ(item.command_id, kSeparatorId);
   } else {
     DCHECK_GE(item.command_id, 0);
   }
 #endif  // NDEBUG
 }
 
 }  // namespace ui