Chromium Code Reviews| Index: ui/views/controls/menu/menu_config.cc |
| diff --git a/ui/views/controls/menu/menu_config.cc b/ui/views/controls/menu/menu_config.cc |
| index 49be18967f6a9fef8018359b76b7db16634def9f..49ef01d111f617b13fce7209385d830112af0828 100644 |
| --- a/ui/views/controls/menu/menu_config.cc |
| +++ b/ui/views/controls/menu/menu_config.cc |
| @@ -41,11 +41,6 @@ MenuConfig::MenuConfig() |
| show_accelerators(true), |
| always_use_icon_to_label_padding(false), |
| align_arrow_and_shortcut(false) { |
| - // Use 40px tall menu items when running in touch optimized mode. |
| - if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) { |
|
sky
2012/08/21 03:03:25
I thought we still wanted this for windows?
Mr4D (OOO till 08-26)
2012/08/21 15:37:16
I added this explicitly for the wrench menu. Howev
|
| - item_top_margin = item_no_icon_top_margin = 12; |
| - item_bottom_margin = item_no_icon_bottom_margin = 13; |
| - } |
| } |
| MenuConfig::~MenuConfig() {} |
| @@ -62,4 +57,14 @@ const MenuConfig& MenuConfig::instance() { |
| return *config_instance; |
| } |
| +// static |
| +const bool MenuConfig::IsNewMenu() { |
| +#if defined(OS_CHROMEOS) |
|
sky
2012/08/21 03:03:25
USE_AURA
Mr4D (OOO till 08-26)
2012/08/21 15:37:16
As stated earlier - I am not so sure if this is co
|
| + return true; |
| +#else |
| + return ui::GetDisplayLayout() == ui::LAYOUT_TOUCH; |
| +#endif |
| +} |
| + |
| + |
| } // namespace views |