Adds support for showing accelerators in bookmark menus.

views/controls/menu/menu_item_view_win.cc

Index: views/controls/menu/menu_item_view_win.cc
diff --git a/views/controls/menu/menu_item_view_win.cc b/views/controls/menu/menu_item_view_win.cc
index 4a90c28c0268f7efc449dbe82c1770d3044491f4..90e9755f8193ebb8537d5cf541a33f6b8987d938 100644
--- a/views/controls/menu/menu_item_view_win.cc
+++ b/views/controls/menu/menu_item_view_win.cc
@@ -95,9 +95,10 @@ void MenuItemView::Paint(gfx::Canvas* canvas, bool for_drag) {
   SkColor fg_color = NativeTheme::instance()->GetThemeColorWithDefault(
       NativeTheme::MENU, MENU_POPUPITEM, state, TMT_TEXTCOLOR,
       default_sys_color);
-  int width = this->width() - item_right_margin_ - label_start_;
   const gfx::Font& font = GetChildViewCount() > 0 ?
       MenuConfig::instance().font_with_controls : MenuConfig::instance().font;
+  int accel_width = parent_menu_item_->GetSubmenu()->max_accelerator_width();
+  int width = this->width() - item_right_margin_ - label_start_ - accel_width;
   gfx::Rect text_bounds(label_start_, top_margin, width, font.height());
   text_bounds.set_x(MirroredLeftPointForRect(text_bounds));
   if (for_drag) {
@@ -116,6 +117,8 @@ void MenuItemView::Paint(gfx::Canvas* canvas, bool for_drag) {
                           GetRootMenuItem()->GetDrawStringFlags());
   }
 
+  PaintAccelerator(canvas);
+
   if (icon_.width() > 0) {
     gfx::Rect icon_bounds(config.item_left_margin,
                           top_margin + (height() - top_margin -