Redo of Issue 8621006: Remove most obvious TOUCH_UI code.

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 36 matching lines @@
 
  private:
   DISALLOW_COPY_AND_ASSIGN(EmptyMenuMenuItem);
 };
 
 }  // namespace
 
 // Padding between child views.
 static const int kChildXPadding = 8;
 
-#if defined(TOUCH_UI)
-const int kMinItemHeightTouch = 40;
-#endif
-
 // MenuItemView ---------------------------------------------------------------
 
 // static
 const int MenuItemView::kMenuItemViewID = 1001;
 
 // static
 const int MenuItemView::kEmptyMenuItemViewID =
     MenuItemView::kMenuItemViewID + 1;
 
 // static
@@ skipping 672 matching lines @@
 
 gfx::Size MenuItemView::CalculatePreferredSize() {
   gfx::Size child_size = GetChildPreferredSize();
   if (IsContainer()) {
     return gfx::Size(
         child_size.width(),
         child_size.height() + GetBottomMargin() + GetTopMargin());
   }
 
   const gfx::Font& font = GetFont();
-#if defined(TOUCH_UI)
-  int height = std::max(font.GetHeight(), kMinItemHeightTouch);
-#else
   int height = font.GetHeight();
-#endif
   return gfx::Size(
       font.GetStringWidth(title_) + label_start_ +
           item_right_margin_ + child_size.width(),
       std::max(height, child_size.height()) + GetBottomMargin() +
           GetTopMargin());
 }
 
 string16 MenuItemView::GetAcceleratorText() {
   if (id() == kEmptyMenuItemViewID) {
     // Don't query the delegate for menus that represent no children.
@@ skipping 10 matching lines @@
 }
 
 bool MenuItemView::IsContainer() const {
   // Let the first child take over |this| when we only have one child and no
   // title.  Note that what child_count() returns is the number of children,
   // not the number of menu items.
   return child_count() == 1 && title_.empty();
 }
 
 }  // namespace views