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

ui/base/models/simple_menu_model.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 UI_BASE_MODELS_SIMPLE_MENU_MODEL_H_
 #define UI_BASE_MODELS_SIMPLE_MENU_MODEL_H_
 #pragma once
 
 #include <vector>
 
@@ skipping 94 matching lines @@
   virtual bool HasIcons() const;
   virtual int GetItemCount() const;
   virtual ItemType GetTypeAt(int index) const;
   virtual int GetCommandIdAt(int index) const;
   virtual string16 GetLabelAt(int index) const;
   virtual bool IsItemDynamicAt(int index) const;
   virtual bool GetAcceleratorAt(int index,
                                 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;
   virtual void HighlightChangedTo(int index);
   virtual void ActivatedAt(int index);
   virtual MenuModel* GetSubmenuModelAt(int index) const;
   virtual void MenuClosed();
+  virtual void SetMenuModelDelegate(ui::MenuModelDelegate* menu_model_delegate);
 
  protected:
   // Some variants of this model (SystemMenuModel) relies on items to be
   // inserted backwards. This is counter-intuitive for the API, so rather than
   // forcing customers to insert things backwards, we return the indices
   // backwards instead. That's what this method is for. By default, it just
   // returns what it's passed.
   virtual int FlipIndex(int index) const;
 
   Delegate* delegate() { return delegate_; }
 
+  MenuModelDelegate* menu_model_delegate() { return menu_model_delegate_; }
+
  private:
   struct Item;
 
   // Functions for inserting items into |items_|.
   void AppendItem(const Item& item);
   void InsertItemAtIndex(const Item& item, int index);
   void ValidateItem(const Item& item);
 
   // Notify the delegate that the menu is closed.
   void OnMenuClosed();
 
   std::vector<Item> items_;
 
   Delegate* delegate_;
 
+  MenuModelDelegate* menu_model_delegate_;
+
   ScopedRunnableMethodFactory<SimpleMenuModel> method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleMenuModel);
 };
 
 }  // namespace ui
 
 #endif  // UI_BASE_MODELS_SIMPLE_MENU_MODEL_H_