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

views/controls/menu/menu_item_view_linux.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/utf_string_conversions.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas_skia.h"
 #include "ui/gfx/favicon_size.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/menu/menu_config.h"
 #include "views/controls/menu/menu_image_util_linux.h"
 #include "views/controls/menu/submenu_view.h"
 
 namespace views {
 
 // Background color when the menu item is selected.
 #if defined(OS_CHROMEOS)
 static const SkColor kSelectedBackgroundColor = SkColorSetRGB(0xDC, 0xE4, 0xFA);
 #else
 static const SkColor kSelectedBackgroundColor = SkColorSetRGB(246, 249, 253);
 #endif
 
 #if defined(TOUCH_UI)
-const int kMinTouchHeight = 46;
+const int kMinTouchHeight = 40;
 #endif
 
 gfx::Size MenuItemView::CalculatePreferredSize() {
   gfx::Size child_size = GetChildPreferredSize();
   if (child_count() == 1 && title_.size() == 0) {
     return gfx::Size(
         child_size.width(),
         child_size.height() + GetBottomMargin() + GetTopMargin());
   }
 
@@ skipping 65 matching lines @@
   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.GetHeight()) / 2, width,
                         font.GetHeight());
   text_bounds.set_x(GetMirroredXForRect(text_bounds));
   canvas->DrawStringInt(WideToUTF16Hack(GetTitle()), font, fg_color,
                         text_bounds.x(), text_bounds.y(), text_bounds.width(),
                         text_bounds.height(),
                         GetRootMenuItem()->GetDrawStringFlags());
-
+#if !defined(TOUCH_UI)
   PaintAccelerator(canvas);
+#endif
 
   // 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(GetMirroredXForRect(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);
     canvas->DrawBitmapInt(*GetSubmenuArrowImage(),
                           arrow_bounds.x(), arrow_bounds.y());
   }
 }
 
 }  // namespace views