Adds support for showing accelerators in bookmark menus.

views/controls/menu/submenu_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/submenu_view.h"
 
 #include "gfx/canvas.h"
+#include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_controller.h"
 #include "views/controls/menu/menu_host.h"
 #include "views/controls/menu/menu_scroll_view_container.h"
 #include "views/widget/root_view.h"
 
 // Height of the drop indicator. This should be an even number.
 static const int kDropIndicatorHeight = 2;
 
 // Color of the drop indicator.
 static const SkColor kDropIndicatorColor = SK_ColorBLACK;
 
 namespace views {
 
 // static
 const int SubmenuView::kSubmenuBorderSize = 3;
 
 SubmenuView::SubmenuView(MenuItemView* parent)
     : parent_menu_item_(parent),
       host_(NULL),
       drop_item_(NULL),
       drop_position_(MenuDelegate::DROP_NONE),
-      scroll_view_container_(NULL) {
+      scroll_view_container_(NULL),
+      max_accelerator_width_(0) {
   DCHECK(parent);
   // We'll delete ourselves, otherwise the ScrollView would delete us on close.
   set_parent_owned(false);
 }
 
 SubmenuView::~SubmenuView() {
   // The menu may not have been closed yet (it will be hidden, but not
   // necessarily closed).
   Close();
 
@@ skipping 44 matching lines @@
     gfx::Size child_pref_size = child->GetPreferredSize();
     child->SetBounds(x, y, menu_item_width, child_pref_size.height());
     y += child_pref_size.height();
   }
 }
 
 gfx::Size SubmenuView::GetPreferredSize() {
   if (GetChildViewCount() == 0)
     return gfx::Size();
 
+  max_accelerator_width_ = 0;
   int max_width = 0;
   int height = 0;
   for (int i = 0; i < GetChildViewCount(); ++i) {
     View* child = GetChildViewAt(i);
     gfx::Size child_pref_size = child->GetPreferredSize();
     max_width = std::max(max_width, child_pref_size.width());
     height += child_pref_size.height();
+    if (child->GetID() == MenuItemView::kMenuItemViewID) {
+      MenuItemView* menu = static_cast<MenuItemView*>(child);
+      max_accelerator_width_ =
+          std::max(max_accelerator_width_, menu->GetAcceleratorTextWidth());
+    }
+  }
+  if (max_accelerator_width_ > 0) {
+    max_accelerator_width_ +=
+        MenuConfig::instance().label_to_accelerator_padding;
   }
   gfx::Insets insets = GetInsets();
-  return gfx::Size(max_width + insets.width(), height + insets.height());
+  return gfx::Size(max_width + max_accelerator_width_ + insets.width(),
+                   height + insets.height());
 }
 
 void SubmenuView::DidChangeBounds(const gfx::Rect& previous,
                                   const gfx::Rect& current) {
   SchedulePaint();
 }
 
 void SubmenuView::PaintChildren(gfx::Canvas* canvas) {
   View::PaintChildren(canvas);
 
@@ skipping 211 matching lines @@
       item_bounds.set_height(kDropIndicatorHeight);
       return item_bounds;
 
     default:
       // Don't render anything for on.
       return gfx::Rect();
   }
 }
 
 }  // namespace views