Setting the touch wrench menu as default menu for ChromeOS

ui/views/controls/menu/menu_config_views.cc

 // Copyright (c) 2012 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 "ui/views/controls/menu/menu_config.h"
 
 #include "grit/ui_resources.h"
 #include "ui/base/layout.h"
 #include "ui/base/native_theme/native_theme_aura.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 13 matching lines @@
   ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
   config->arrow_to_edge_padding = 20;
   config->icon_to_label_padding = 4;
   config->arrow_width = rb.GetImageNamed(IDR_MENU_ARROW).ToImageSkia()->width();
   const gfx::ImageSkia* check = rb.GetImageNamed(IDR_MENU_CHECK).ToImageSkia();
   // Add 4 to force some padding between check and label.
   config->check_width = check->width() + 4;
   config->check_height = check->height();
   config->item_left_margin = 4;
   config->item_min_height = 29;
-  // TODO(skuhne): Separators in menus should have the same padding in touch
-  // mode but currently the touch wrench menu relies on separators having no
-  // padding to implement full-height buttons.
-  if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH)
-    config->separator_height = 1;
-  else
-    config->separator_height = 15;
+  config->separator_height = 15;
   config->font = rb.GetFont(ResourceBundle::BaseFont);
   config->label_to_arrow_padding = 20;
   config->label_to_accelerator_padding = 20;
   config->always_use_icon_to_label_padding = true;
   config->align_arrow_and_shortcut = true;
   config->offset_context_menus = true;
 
   return config;
 }
 
 }  // namespace views