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 22 matching lines...) Expand all Loading... |
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 render_gutter(false), | 36 render_gutter(false), |
37 show_mnemonics(false), | 37 show_mnemonics(false), |
38 scroll_arrow_height(3), | 38 scroll_arrow_height(3), |
39 label_to_accelerator_padding(10), | 39 label_to_accelerator_padding(10), |
40 item_min_height(0), | 40 item_min_height(0), |
41 show_accelerators(true), | 41 show_accelerators(true), |
42 always_use_icon_to_label_padding(false), | 42 always_use_icon_to_label_padding(false), |
43 align_arrow_and_shortcut(false) { | 43 align_arrow_and_shortcut(false), |
| 44 offset_context_menus(false) { |
44 // Use 40px tall menu items when running in touch optimized mode. | 45 // Use 40px tall menu items when running in touch optimized mode. |
45 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) { | 46 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) { |
46 item_top_margin = item_no_icon_top_margin = 12; | 47 item_top_margin = item_no_icon_top_margin = 12; |
47 item_bottom_margin = item_no_icon_bottom_margin = 13; | 48 item_bottom_margin = item_no_icon_bottom_margin = 13; |
48 } | 49 } |
49 } | 50 } |
50 | 51 |
51 MenuConfig::~MenuConfig() {} | 52 MenuConfig::~MenuConfig() {} |
52 | 53 |
53 void MenuConfig::Reset() { | 54 void MenuConfig::Reset() { |
54 delete config_instance; | 55 delete config_instance; |
55 config_instance = NULL; | 56 config_instance = NULL; |
56 } | 57 } |
57 | 58 |
58 // static | 59 // static |
59 const MenuConfig& MenuConfig::instance() { | 60 const MenuConfig& MenuConfig::instance() { |
60 if (!config_instance) | 61 if (!config_instance) |
61 config_instance = Create(); | 62 config_instance = Create(); |
62 return *config_instance; | 63 return *config_instance; |
63 } | 64 } |
64 | 65 |
65 } // namespace views | 66 } // namespace views |
OLD | NEW |