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

chrome/browser/chromeos/status/input_method_menu.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 CHROME_BROWSER_CHROMEOS_STATUS_INPUT_METHOD_MENU_H_
 #define CHROME_BROWSER_CHROMEOS_STATUS_INPUT_METHOD_MENU_H_
 #pragma once
 
 #include <string>
 
@@ skipping 30 matching lines @@
   virtual bool HasIcons() const;
   virtual int GetItemCount() const;
   virtual ui::MenuModel::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 ui::MenuModel* GetSubmenuModelAt(int index) const;
   virtual void HighlightChangedTo(int index);
   virtual void ActivatedAt(int index);
   virtual void MenuWillShow();
+  virtual void SetMenuModelDelegate(ui::MenuModelDelegate* delegate);
 
   // views::ViewMenuDelegate implementation. Sub classes can override the method
   // to adjust the position of the menu.
   virtual void RunMenu(views::View* unused_source,
                        const gfx::Point& pt);
 
   // InputMethodLibrary::Observer implementation.
   virtual void InputMethodChanged(
       InputMethodLibrary* obj,
       const InputMethodDescriptor& current_input_method,
@@ skipping 102 matching lines @@
   // true if the menu is for a dialog in OOBE screen. In the dialog, we don't
   // use radio buttons.
   const bool for_out_of_box_experience_dialog_;
 
   DISALLOW_COPY_AND_ASSIGN(InputMethodMenu);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_STATUS_INPUT_METHOD_MENU_H_