| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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 #ifndef VIEWS_CONTROLS_MENU_MENU_CONFIG_H_ | 5 #ifndef VIEWS_CONTROLS_MENU_MENU_CONFIG_H_ |
| 6 #define VIEWS_CONTROLS_MENU_MENU_CONFIG_H_ | 6 #define VIEWS_CONTROLS_MENU_MENU_CONFIG_H_ |
| 7 | 7 |
| 8 #include "gfx/font.h" | 8 #include "gfx/font.h" |
| 9 | 9 |
| 10 namespace views { | 10 namespace views { |
| 11 | 11 |
| (...skipping 23 matching lines...) Expand all Loading... |
| 35 // Resets the single shared MenuConfig instance. The next time instance() is | 35 // Resets the single shared MenuConfig instance. The next time instance() is |
| 36 // invoked a new MenuConfig is created and configured. | 36 // invoked a new MenuConfig is created and configured. |
| 37 static void Reset(); | 37 static void Reset(); |
| 38 | 38 |
| 39 // Returns the single shared MenuConfig instance, creating if necessary. | 39 // Returns the single shared MenuConfig instance, creating if necessary. |
| 40 static const MenuConfig& instance(); | 40 static const MenuConfig& instance(); |
| 41 | 41 |
| 42 // Font used by menus. | 42 // Font used by menus. |
| 43 gfx::Font font; | 43 gfx::Font font; |
| 44 | 44 |
| 45 // Font used when the menu has children. |
| 46 gfx::Font font_with_controls; |
| 47 |
| 45 // Margins between the top of the item and the label. | 48 // Margins between the top of the item and the label. |
| 46 int item_top_margin; | 49 int item_top_margin; |
| 47 | 50 |
| 48 // Margins between the bottom of the item and the label. | 51 // Margins between the bottom of the item and the label. |
| 49 int item_bottom_margin; | 52 int item_bottom_margin; |
| 50 | 53 |
| 51 // Margins used if the menu doesn't have icons. | 54 // Margins used if the menu doesn't have icons. |
| 52 int item_no_icon_top_margin; | 55 int item_no_icon_top_margin; |
| 53 int item_no_icon_bottom_margin; | 56 int item_no_icon_bottom_margin; |
| 54 | 57 |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 93 | 96 |
| 94 private: | 97 private: |
| 95 // Creates and configures a new MenuConfig as appropriate for the current | 98 // Creates and configures a new MenuConfig as appropriate for the current |
| 96 // platform. | 99 // platform. |
| 97 static MenuConfig* Create(); | 100 static MenuConfig* Create(); |
| 98 }; | 101 }; |
| 99 | 102 |
| 100 } // namespace views | 103 } // namespace views |
| 101 | 104 |
| 102 #endif // VIEWS_CONTROLS_MENU_MENU_CONFIG_H_ | 105 #endif // VIEWS_CONTROLS_MENU_MENU_CONFIG_H_ |
| OLD | NEW |