| Index: views/controls/menu/menu_item_view.cc
|
| diff --git a/views/controls/menu/menu_item_view.cc b/views/controls/menu/menu_item_view.cc
|
| index 9d0d119cf9baeb229628020ea014929864ccd54a..c36164881581ad5e79307d1a3e2b22cc88f7e3da 100644
|
| --- a/views/controls/menu/menu_item_view.cc
|
| +++ b/views/controls/menu/menu_item_view.cc
|
| @@ -54,10 +54,6 @@ class EmptyMenuMenuItem : public MenuItemView {
|
| // Padding between child views.
|
| static const int kChildXPadding = 8;
|
|
|
| -#if defined(TOUCH_UI)
|
| -const int kMinItemHeightTouch = 40;
|
| -#endif
|
| -
|
| // MenuItemView ---------------------------------------------------------------
|
|
|
| // static
|
| @@ -750,11 +746,7 @@ gfx::Size MenuItemView::CalculatePreferredSize() {
|
| }
|
|
|
| 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(),
|
|
|