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

Also removed painting keyboard accelerators.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/7825024

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99745 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 11 insertions, 3 deletions

diff --git a/views/controls/menu/menu_config.cc b/views/controls/menu/menu_config.cc
index d3c510d..0f77921 100644
--- a/views/controls/menu/menu_config.cc
+++ b/views/controls/menu/menu_config.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -32,7 +32,8 @@ MenuConfig::MenuConfig()
       render_gutter(false),
       show_mnemonics(false),
       scroll_arrow_height(3),
-      label_to_accelerator_padding(10) {
+      label_to_accelerator_padding(10),
+      show_accelerators(true) {
 }
 
 MenuConfig::~MenuConfig() {}
diff --git a/views/controls/menu/menu_config.h b/views/controls/menu/menu_config.h
index 3c566e8..001fdfe 100644
--- a/views/controls/menu/menu_config.h
+++ b/views/controls/menu/menu_config.h
@@ -88,6 +88,9 @@ struct VIEWS_EXPORT MenuConfig {
   // accelerator.
   int label_to_accelerator_padding;
 
+  // Whether the keyboard accelerators are visible.
+  bool show_accelerators;
+
  private:
   // Creates and configures a new MenuConfig as appropriate for the current
   // platform.
diff --git a/views/controls/menu/menu_config_linux.cc b/views/controls/menu/menu_config_linux.cc
index c55fa91..d0aca45 100644
--- a/views/controls/menu/menu_config_linux.cc
+++ b/views/controls/menu/menu_config_linux.cc
@@ -16,6 +16,7 @@ MenuConfig* MenuConfig::Create() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
 #if defined(TOUCH_UI)
   config->font = rb.GetFont(ResourceBundle::LargeFont);
+  config->show_accelerators = false;
 #else
   config->font = rb.GetFont(ResourceBundle::BaseFont);
 #endif
diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc
index 8181793..86e6a70 100644
--- a/views/controls/menu/menu_item_view.cc
+++ b/views/controls/menu/menu_item_view.cc
@@ -689,6 +689,9 @@ string16 MenuItemView::GetAcceleratorText() {
     return string16();
   }
 
+  if(!MenuConfig::instance().show_accelerators)
+    return string16();
+
   Accelerator accelerator;
   return (GetDelegate() &&
           GetDelegate()->GetAccelerator(GetCommand(), &accelerator)) ?
diff --git a/views/controls/menu/menu_item_view_linux.cc b/views/controls/menu/menu_item_view_linux.cc
index b90c7ce..c64e320 100644
--- a/views/controls/menu/menu_item_view_linux.cc
+++ b/views/controls/menu/menu_item_view_linux.cc
@@ -25,7 +25,7 @@ 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() {