Lands http://codereview.chromium.org/2928005/ for Dill:

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 36 matching lines @@
 }
 
 void SimpleMenuModel::Delegate::MenuClosed() {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // SimpleMenuModel, public:
 
 SimpleMenuModel::SimpleMenuModel(Delegate* delegate)
     : delegate_(delegate),
+      menu_model_delegate_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(method_factory_(this)) {
 }
 
 SimpleMenuModel::~SimpleMenuModel() {
 }
 
 void SimpleMenuModel::AddItem(int command_id, const string16& label) {
   Item item = { command_id, label, SkBitmap(), TYPE_COMMAND, -1, NULL, NULL };
   AppendItem(item);
 }
@@ skipping 171 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 33 matching lines @@
 
 void SimpleMenuModel::MenuClosed() {
   // Due to how menus work on the different platforms, ActivatedAt will be
   // called after this.  It's more convenient for the delegate to be called
   // afterwards though, so post a task.
   MessageLoop::current()->PostTask(
       FROM_HERE,
       method_factory_.NewRunnableMethod(&SimpleMenuModel::OnMenuClosed));
 }
 
+void SimpleMenuModel::SetMenuModelDelegate(
+      ui::MenuModelDelegate* menu_model_delegate) {
+  menu_model_delegate_ = menu_model_delegate;
+}
+
 void SimpleMenuModel::OnMenuClosed() {
   if (delegate_)
     delegate_->MenuClosed();
 }
 
 int SimpleMenuModel::FlipIndex(int index) const {
   return index;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
@@ skipping 13 matching lines @@
 #ifndef NDEBUG
   if (item.type == TYPE_SEPARATOR) {
     DCHECK_EQ(item.command_id, kSeparatorId);
   } else {
     DCHECK_GE(item.command_id, 0);
   }
 #endif  // NDEBUG
 }
 
 }  // namespace ui