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;

[oshima, 2011/04/14 17:27:31]

const gfx::Font&

[rhashimoto, 2011/04/14 18:27:04]

That wouldn't allow subclasses a convenient way to specify the default font,
currently done by returning NULL.  Should we add a GetDefaultFont() for them to
return?

[oshima, 2011/04/15 17:40:12]

Ah i see. Hmm, then pointer may be fine. Alternative way is to return the
default
font in base class. It can eliminate one if in the menu_item_view.

[rhashimoto, 2011/04/15 21:20:27]

If we put the default in the base class then subclasses will need to call the
base class for the default font (fonts can be set per menu item):

const gfx::Font* Subclass::GetLabelFont(int id) const {
  if (id == ITEM_WITH_SPECIAL_FONT)
    return GetSpecialFontPtr();
  else
    return MenuDelegate::GetLabelFont(id);
}

I think it's easier for subclasses to use a default of NULL.

[oshima, 2011/04/15 22:26:51]

My preference is actually above. It guarantees that it will do the same
thing as super class does, although in this case, this is probably fine.
There were several bugs due to this pattern, subclass changing the default
behavior of super class. Since there is no guarantee that returning NULL is same
as what superclass does, except for you know when you write the code, this tends
to be error prone. (This is just FYI)

[rhashimoto, 2011/04/15 23:44:32]

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_