Change status button menu implementation from Menu2 to MenuItemView.

views/controls/menu/menu_delegate.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 VIEWS_CONTROLS_MENU_MENU_DELEGATE_H_
 #define VIEWS_CONTROLS_MENU_MENU_DELEGATE_H_
 #pragma once
 
 #include <set>
 #include <string>
 
 #include "base/logging.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "views/controls/menu/menu_item_view.h"
 #include "views/events/event.h"
 
 using ui::OSExchangeData;
 
+namespace gfx {
+
+class Font;
+
+}  // namespace gfx
+
 namespace views {
 
 class DropTargetEvent;
 class MenuButton;
 
 // MenuDelegate --------------------------------------------------------------
 
 // Delegate for a menu. This class is used as part of MenuItemView, see it
 // for details.
 // TODO(sky): merge this with ui::MenuModel.
@@ skipping 16 matching lines @@
   };
 
   // Whether or not an item should be shown as checked. This is invoked for
   // radio buttons and check buttons.
   virtual bool IsItemChecked(int id) const;
 
   // The string shown for the menu item. This is only invoked when an item is
   // added with an empty label.
   virtual std::wstring GetLabel(int id) const;
 
+  // The font for the menu item label.  Returning NULL selects the default
+  // menu font.
+  virtual const gfx::Font& GetLabelFont(int id) const;

[sky, 2011/04/20 16:02:58]

Last sentence isn't right. Maybe just remove it entirely.

[rhashimoto, 2011/04/21 19:31:17]

Done.

+
   // The tooltip shown for the menu item. This is invoked when the user
   // hovers over the item, and no tooltip text has been set for that item.
   virtual std::wstring GetTooltipText(int id, const gfx::Point& screen_loc);
 
   // If there is an accelerator for the menu item with id |id| it is set in
   // |accelerator| and true is returned.
   virtual bool GetAccelerator(int id, Accelerator* accelerator);
 
   // Shows the context menu with the specified id. This is invoked when the
   // user does the appropriate gesture to show a context menu. The id
@@ skipping 108 matching lines @@
                                        bool* has_mnemonics,
                                        MenuButton** button);
 
   // Returns the max width menus can grow to be.
   virtual int GetMaxWidthForMenu();
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_MENU_DELEGATE_H_