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 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
44 show_accelerators(true), | 44 show_accelerators(true), |
45 always_use_icon_to_label_padding(false), | 45 always_use_icon_to_label_padding(false), |
46 align_arrow_and_shortcut(false), | 46 align_arrow_and_shortcut(false), |
47 offset_context_menus(false) { | 47 offset_context_menus(false) { |
48 // Use 40px tall menu items when running in touch optimized mode. | 48 // Use 40px tall menu items when running in touch optimized mode. |
49 // For Windows use 40px tall menu items when running in touch optimized mode. | 49 // For Windows use 40px tall menu items when running in touch optimized mode. |
50 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) { | 50 if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) { |
51 item_top_margin = item_no_icon_top_margin = 12; | 51 item_top_margin = item_no_icon_top_margin = 12; |
52 item_bottom_margin = item_no_icon_bottom_margin = 13; | 52 item_bottom_margin = item_no_icon_bottom_margin = 13; |
53 } | 53 } |
| 54 Init(); |
54 } | 55 } |
55 | 56 |
56 MenuConfig::~MenuConfig() {} | 57 MenuConfig::~MenuConfig() {} |
57 | 58 |
58 void MenuConfig::Reset() { | 59 void MenuConfig::Reset() { |
59 delete config_instance; | 60 delete config_instance; |
60 config_instance = NULL; | 61 config_instance = NULL; |
61 } | 62 } |
62 | 63 |
63 // static | 64 // static |
64 const MenuConfig& MenuConfig::instance() { | 65 const MenuConfig& MenuConfig::instance() { |
65 if (!config_instance) | 66 if (!config_instance) |
66 config_instance = Create(); | 67 config_instance = new MenuConfig(); |
67 return *config_instance; | 68 return *config_instance; |
68 } | 69 } |
69 | 70 |
70 } // namespace views | 71 } // namespace views |
OLD | NEW |