Adds support for showing accelerators in bookmark menus.

views/controls/menu/menu_item_view.cc

 // 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.
 
 #include "views/controls/menu/menu_item_view.h"
 
 #include "app/l10n_util.h"
 #include "gfx/canvas.h"
 #include "grit/app_strings.h"
+#include "views/controls/button/text_button.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_separator.h"
 #include "views/controls/menu/submenu_view.h"
 
 namespace views {
 
 namespace {
 
 // EmptyMenuMenuItem ---------------------------------------------------------
 
 // EmptyMenuMenuItem is used when a menu has no menu items. EmptyMenuMenuItem
 // is itself a MenuItemView, but it uses a different ID so that it isn't
 // identified as a MenuItemView.
 
 class EmptyMenuMenuItem : public MenuItemView {
  public:
-  explicit EmptyMenuMenuItem(MenuItemView* parent) :
-      MenuItemView(parent, 0, NORMAL) {
+  explicit EmptyMenuMenuItem(MenuItemView* parent)
+      : MenuItemView(parent, 0, NORMAL) {
     SetTitle(l10n_util::GetString(IDS_APP_MENU_EMPTY_SUBMENU));
     // Set this so that we're not identified as a normal menu item.
     SetID(kEmptyMenuItemViewID);
     SetEnabled(false);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EmptyMenuMenuItem);
 };
 
@@ skipping 266 matching lines @@
   // Child views are layed out right aligned and given the full height. To right
   // align start with the last view and progress to the first.
   for (int i = child_count - 1, x = width() - item_right_margin_; i >= 0; --i) {
     View* child = GetChildViewAt(i);
     int width = child->GetPreferredSize().width();
     child->SetBounds(x - width, 0, width, height());
     x -= width - kChildXPadding;
   }
 }
 
+int MenuItemView::GetAcceleratorTextWidth() {
+  std::wstring text = GetAcceleratorText();
+  return text.empty() ? 0 : MenuConfig::instance().font.GetStringWidth(text);
+}
+
 MenuItemView::MenuItemView(MenuItemView* parent,
                            int command,
                            MenuItemView::Type type) {
   Init(parent, command, type, NULL);
 }
 
 // Calculates all sizes that we can from the OS.
 //
 // This is invoked prior to Running a menu.
 void MenuItemView::UpdateMenuPartSizes(bool has_icons) {
@@ skipping 120 matching lines @@
     } else if (child->GetID() == EmptyMenuMenuItem::kEmptyMenuItemViewID) {
       submenu_->RemoveChildView(child);
     }
   }
 }
 
 void MenuItemView::AdjustBoundsForRTLUI(gfx::Rect* rect) const {
   rect->set_x(MirroredLeftPointForRect(*rect));
 }
 
+void MenuItemView::PaintAccelerator(gfx::Canvas* canvas) {
+  std::wstring accel_text = GetAcceleratorText();
+  if (accel_text.empty())
+    return;
+
+  const gfx::Font& font = MenuConfig::instance().font;
+  int available_height = height() - GetTopMargin() - GetBottomMargin();
+  int max_accel_width =
+      parent_menu_item_->GetSubmenu()->max_accelerator_width();
+  gfx::Rect accel_bounds(width() - item_right_margin_ - max_accel_width,
+                         GetTopMargin(), max_accel_width, available_height);
+  accel_bounds.set_x(MirroredLeftPointForRect(accel_bounds));
+  int flags = GetRootMenuItem()->GetDrawStringFlags() |
+      gfx::Canvas::TEXT_VALIGN_MIDDLE;
+  flags &= ~(gfx::Canvas::TEXT_ALIGN_RIGHT | gfx::Canvas::TEXT_ALIGN_LEFT);
+  if (base::i18n::IsRTL())
+    flags |= gfx::Canvas::TEXT_ALIGN_LEFT;
+  else
+    flags |= gfx::Canvas::TEXT_ALIGN_RIGHT;
+  canvas->DrawStringInt(
+      accel_text, font, TextButton::kDisabledColor, accel_bounds.x(),
+      accel_bounds.y(), accel_bounds.width(), accel_bounds.height(),
+      flags);
+}
+
 void MenuItemView::DestroyAllMenuHosts() {
   if (!HasSubmenu())
     return;
 
   submenu_->Close();
   for (int i = 0, item_count = submenu_->GetMenuItemCount(); i < item_count;
        ++i) {
     submenu_->GetMenuItemAt(i)->DestroyAllMenuHosts();
   }
 }
@@ skipping 19 matching lines @@
 
   int width = 0;
   for (int i = 0; i < child_count; ++i) {
     if (i)
       width += kChildXPadding;
     width += GetChildViewAt(i)->GetPreferredSize().width();
   }
   return width;
 }
 
+std::wstring MenuItemView::GetAcceleratorText() {
+  Accelerator accelerator;
+  return (GetDelegate() &&
+          GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ?
+      accelerator.GetShortcutText() : std::wstring();
+}
+
 }  // namespace views