Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(30)

Unified Diff: ui/views/controls/menu/menu_config_views.cc

Issue 10837317: Setting the touch wrench menu as default menu for ChromeOS (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: And another merge! Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/controls/menu/menu_config.cc ('k') | ui/views/controls/menu/menu_item_view.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/controls/menu/menu_config_views.cc
diff --git a/ui/views/controls/menu/menu_config_views.cc b/ui/views/controls/menu/menu_config_views.cc
index d6943d4f62a8f1491508cc08b522b140064a6a0c..e369c95627dbc3e05219b15c4097918cbe89849a 100644
--- a/ui/views/controls/menu/menu_config_views.cc
+++ b/ui/views/controls/menu/menu_config_views.cc
@@ -31,13 +31,7 @@ MenuConfig* MenuConfig::Create() {
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;
« no previous file with comments | « ui/views/controls/menu/menu_config.cc ('k') | ui/views/controls/menu/menu_item_view.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698