| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/views/controls/menu/menu_config.h" | 5 #include "ui/views/controls/menu/menu_config.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
| 8 #include "ui/base/layout.h" | 8 #include "ui/base/layout.h" |
| 9 | 9 |
| 10 namespace views { | 10 namespace views { |
| (...skipping 15 matching lines...) Expand all Loading... |
| 26 icon_to_label_padding(8), | 26 icon_to_label_padding(8), |
| 27 gutter_to_label(5), | 27 gutter_to_label(5), |
| 28 check_width(16), | 28 check_width(16), |
| 29 check_height(16), | 29 check_height(16), |
| 30 radio_width(16), | 30 radio_width(16), |
| 31 radio_height(16), | 31 radio_height(16), |
| 32 arrow_height(9), | 32 arrow_height(9), |
| 33 arrow_width(9), | 33 arrow_width(9), |
| 34 gutter_width(0), | 34 gutter_width(0), |
| 35 separator_height(6), | 35 separator_height(6), |
| 36 separator_upper_height(3), |
| 37 separator_lower_height(4), |
| 38 separator_spacing_height(3), |
| 36 render_gutter(false), | 39 render_gutter(false), |
| 37 show_mnemonics(false), | 40 show_mnemonics(false), |
| 38 scroll_arrow_height(3), | 41 scroll_arrow_height(3), |
| 39 label_to_accelerator_padding(10), | 42 label_to_accelerator_padding(10), |
| 40 item_min_height(0), | 43 item_min_height(0), |
| 41 show_accelerators(true), | 44 show_accelerators(true), |
| 42 always_use_icon_to_label_padding(false), | 45 always_use_icon_to_label_padding(false), |
| 43 align_arrow_and_shortcut(false) { | 46 align_arrow_and_shortcut(false) { |
| 44 // Use 40px tall menu items when running in touch optimized mode. | 47 // For Windows use 40px tall menu items when running in touch optimized mode. |
| 45 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) { | 48 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) { |
| 46 item_top_margin = item_no_icon_top_margin = 12; | 49 item_top_margin = item_no_icon_top_margin = 12; |
| 47 item_bottom_margin = item_no_icon_bottom_margin = 13; | 50 item_bottom_margin = item_no_icon_bottom_margin = 13; |
| 48 } | 51 } |
| 49 } | 52 } |
| 50 | 53 |
| 51 MenuConfig::~MenuConfig() {} | 54 MenuConfig::~MenuConfig() {} |
| 52 | 55 |
| 53 void MenuConfig::Reset() { | 56 void MenuConfig::Reset() { |
| 54 delete config_instance; | 57 delete config_instance; |
| 55 config_instance = NULL; | 58 config_instance = NULL; |
| 56 } | 59 } |
| 57 | 60 |
| 58 // static | 61 // static |
| 59 const MenuConfig& MenuConfig::instance() { | 62 const MenuConfig& MenuConfig::instance() { |
| 60 if (!config_instance) | 63 if (!config_instance) |
| 61 config_instance = Create(); | 64 config_instance = Create(); |
| 62 return *config_instance; | 65 return *config_instance; |
| 63 } | 66 } |
| 64 | 67 |
| 68 // static |
| 69 bool MenuConfig::IsNewMenu() { |
| 70 #if defined(USE_AURA) |
| 71 return true; |
| 72 #else |
| 73 return ui::GetDisplayLayout() == ui::LAYOUT_TOUCH; |
| 74 #endif |
| 75 } |
| 76 |
| 77 |
| 65 } // namespace views | 78 } // namespace views |
| OLD | NEW |