Adds support for showing accelerators in bookmark menus.

views/controls/menu/menu_item_view.h

 // Copyright (c) 2010 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_ITEM_VIEW_H_
 #define VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_
 
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "views/view.h"
 
@@ skipping 228 matching lines @@
   // Returns the descendant with the specified command.
   MenuItemView* GetMenuItemByID(int id);
 
   // Invoke if you remove/add children to the menu while it's showing. This
   // recalculates the bounds.
   void ChildrenChanged();
 
   // Sizes any child views.
   virtual void Layout();
 
+  // Returns the amount of space needed to accomodate the accelerator. The
+  // space needed for the accelerator is NOT included in the preferred width.
+  int GetAcceleratorTextWidth();
+
  protected:
   // Creates a MenuItemView. This is used by the various AddXXX methods.
   MenuItemView(MenuItemView* parent, int command, Type type);
 
  private:
   // Calculates all sizes that we can from the OS.
   //
   // This is invoked prior to Running a menu.
   static void UpdateMenuPartSizes(bool has_icons);
 
@@ skipping 23 matching lines @@
   void RemoveEmptyMenus();
 
   // Given bounds within our View, this helper routine mirrors the bounds if
   // necessary.
   void AdjustBoundsForRTLUI(gfx::Rect* rect) const;
 
   // Actual paint implementation. If for_drag is true, portions of the menu
   // are not rendered.
   void Paint(gfx::Canvas* canvas, bool for_drag);
 
+  // Paints the accelerator.
+  void PaintAccelerator(gfx::Canvas* canvas);
+
   // Destroys the window used to display this menu and recursively destroys
   // the windows used to display all descendants.
   void DestroyAllMenuHosts();
 
+  // Returns the accelerator text.
+  std::wstring GetAcceleratorText();
+
   // Returns the various margins.
   int GetTopMargin();
   int GetBottomMargin();
 
   // Returns the preferred width (and padding) of any children.
   int GetChildPreferredWidth();
 
   // The delegate. This is only valid for the root menu item. You shouldn't
   // use this directly, instead use GetDelegate() which walks the tree as
   // as necessary.
@@ skipping 44 matching lines @@
 
   // Preferred height of menu items. Reset every time a menu is run.
   static int pref_menu_height_;
 
   DISALLOW_COPY_AND_ASSIGN(MenuItemView);
 };
 
 }  // namespace views
 
 #endif  // VIEWS_CONTROLS_MENU_MENU_ITEM_VIEW_H_