Adds support for showing accelerators in bookmark menus.

views/controls/menu/menu_item_view_gtk.cc

 // Copyright (c) 2009 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.
 
 #include "views/controls/menu/menu_item_view.h"
 
 #include "app/resource_bundle.h"
 #include "gfx/canvas.h"
 #include "gfx/favicon_size.h"
 #include "grit/app_resources.h"
@@ skipping 54 matching lines @@
   }
 
   // Render the foreground.
 #if defined(OS_CHROMEOS)
   SkColor fg_color =
       IsEnabled() ? SK_ColorBLACK : SkColorSetRGB(0x80, 0x80, 0x80);
 #else
   SkColor fg_color =
       IsEnabled() ? TextButton::kEnabledColor : TextButton::kDisabledColor;
 #endif
-  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 +
                         (available_height - font.height()) / 2, width,
                         font.height());
   text_bounds.set_x(MirroredLeftPointForRect(text_bounds));
   canvas->DrawStringInt(GetTitle(), font, fg_color,
                         text_bounds.x(), text_bounds.y(), text_bounds.width(),
                         text_bounds.height(),
                         GetRootMenuItem()->GetDrawStringFlags());
 
+  PaintAccelerator(canvas);
+
   // Render the icon.
   if (icon_.width() > 0) {
     gfx::Rect icon_bounds(config.item_left_margin,
                           top_margin + (height() - top_margin -
                           bottom_margin - icon_.height()) / 2,
                           icon_.width(),
                           icon_.height());
     icon_bounds.set_x(MirroredLeftPointForRect(icon_bounds));
     canvas->DrawBitmapInt(icon_, icon_bounds.x(), icon_bounds.y());
   }
 
   // Render the submenu indicator (arrow).
   if (HasSubmenu()) {
     gfx::Rect arrow_bounds(this->width() - item_right_margin_ +
                            config.label_to_arrow_padding,
                            top_margin + (available_height -
                                          config.arrow_width) / 2,
                            config.arrow_width, height());
     AdjustBoundsForRTLUI(&arrow_bounds);
     ResourceBundle& rb = ResourceBundle::GetSharedInstance();
     canvas->DrawBitmapInt(*rb.GetBitmapNamed(IDR_MENU_ARROW),
                           arrow_bounds.x(), arrow_bounds.y());
   }
 }
 
 }  // namespace views