Fixes couple of issues with bookmarks in wrench menu:

views/controls/menu/menu_item_view.cc

 // Copyright (c) 2011 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 "base/i18n/case_conversion.h"
 #include "base/stl_util-inl.h"
 #include "base/utf_string_conversions.h"
 #include "grit/app_strings.h"
@@ skipping 19 matching lines @@
 // 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) {
+    // Set this so that we're not identified as a normal menu item.
+    SetID(kEmptyMenuItemViewID);
     SetTitle(UTF16ToWide(
         l10n_util::GetStringUTF16(IDS_APP_MENU_EMPTY_SUBMENU)));
-    // Set this so that we're not identified as a normal menu item.
-    SetID(kEmptyMenuItemViewID);
     SetEnabled(false);
   }
 
   virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
     // Empty menu items shouldn't have a tooltip.
     return false;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EmptyMenuMenuItem);
@@ skipping 677 matching lines @@
   int width = 0;
   for (int i = 0; i < child_count(); ++i) {
     if (i)
       width += kChildXPadding;
     width += GetChildViewAt(i)->GetPreferredSize().width();
   }
   return width;
 }
 
 string16 MenuItemView::GetAcceleratorText() {
+  if (GetID() == kEmptyMenuItemViewID) {
+    // Don't query the delegate for menus that represent no children.
+    return string16();
+  }
+
   Accelerator accelerator;
   return (GetDelegate() &&
           GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ?
       accelerator.GetShortcutText() : string16();
 }
 
 }  // namespace views