OLD | NEW |
---|---|
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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 "views/controls/menu/menu_config.h" | 5 #include "views/controls/menu/menu_config.h" |
6 | 6 |
7 #include "build/build_config.h" | 7 #include "build/build_config.h" |
8 | 8 |
9 namespace views { | 9 namespace views { |
10 | 10 |
(...skipping 14 matching lines...) Expand all Loading... | |
25 check_height(16), | 25 check_height(16), |
26 radio_width(16), | 26 radio_width(16), |
27 radio_height(16), | 27 radio_height(16), |
28 arrow_height(9), | 28 arrow_height(9), |
29 arrow_width(9), | 29 arrow_width(9), |
30 gutter_width(0), | 30 gutter_width(0), |
31 separator_height(6), | 31 separator_height(6), |
32 render_gutter(false), | 32 render_gutter(false), |
33 show_mnemonics(false), | 33 show_mnemonics(false), |
34 scroll_arrow_height(3), | 34 scroll_arrow_height(3), |
35 label_to_accelerator_padding(10) { | 35 label_to_accelerator_padding(10), |
36 show_accelerators(true) { | |
37 #if defined(TOUCH_UI) | |
38 show_accelerators = false; | |
sky
2011/09/02 23:12:30
Set this in menu_config_linux, where there is alre
Emmanuel Saint-loubert-Bié
2011/09/02 23:29:01
Yes that is better
| |
39 #endif | |
36 } | 40 } |
37 | 41 |
38 MenuConfig::~MenuConfig() {} | 42 MenuConfig::~MenuConfig() {} |
39 | 43 |
40 void MenuConfig::Reset() { | 44 void MenuConfig::Reset() { |
41 delete config_instance; | 45 delete config_instance; |
42 config_instance = NULL; | 46 config_instance = NULL; |
43 } | 47 } |
44 | 48 |
45 // static | 49 // static |
46 const MenuConfig& MenuConfig::instance() { | 50 const MenuConfig& MenuConfig::instance() { |
47 if (!config_instance) | 51 if (!config_instance) |
48 config_instance = Create(); | 52 config_instance = Create(); |
49 return *config_instance; | 53 return *config_instance; |
50 } | 54 } |
51 | 55 |
52 } // namespace views | 56 } // namespace views |
OLD | NEW |