For Touch: remove some menu items for experimentation, adjust sizes.

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.h"
 #include "base/utf_string_conversions.h"
 #include "grit/ui_strings.h"
@@ skipping 69 matching lines @@
       controller_(NULL),
       canceled_(false),
       parent_menu_item_(NULL),
       type_(SUBMENU),
       selected_(false),
       command_(0),
       submenu_(NULL),
       has_mnemonics_(false),
       show_mnemonics_(false),
       has_icons_(false),
+#ifdef TOUCH_UI

[sky, 2011/09/02 22:30:10]

This should be in MenuConfig, which is the central place to specify the config
for a particular platform.

[Emmanuel Saint-loubert-Bié, 2011/09/02 23:04:37]

Thanks, I did not know/realize that.

+      show_accelerators_(false),
+#else
+      show_accelerators_(true),
+#endif
       top_margin_(-1),
       bottom_margin_(-1),
       requested_menu_position_(POSITION_BEST_FIT),
       actual_menu_position_(requested_menu_position_) {
   // NOTE: don't check the delegate for NULL, UpdateMenuPartSizes supplies a
   // NULL delegate.
   Init(NULL, 0, SUBMENU, delegate);
 }
 
 void MenuItemView::ChildPreferredSizeChanged(View* child) {
@@ skipping 577 matching lines @@
     if (i)
       width += kChildXPadding;
     width += child_at(i)->GetPreferredSize().width();
   }
   // Return a height of 0 to indicate that we should use the title height
   // instead.
   return gfx::Size(width, 0);
 }
 
 string16 MenuItemView::GetAcceleratorText() {
-  if (id() == kEmptyMenuItemViewID) {
-    // Don't query the delegate for menus that represent no children.
+  if (id() == kEmptyMenuItemViewID || !show_accelerators_) {
+    // Don't query the delegate for menus that represent no children, or
+    // when accelerators are not shown return an empty string.
     return string16();
   }
 
   Accelerator accelerator;
   return (GetDelegate() &&
           GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ?
       accelerator.GetShortcutText() : string16();
 }
 
 }  // namespace views