| Index: ui/views/controls/menu/menu_config.h
|
| diff --git a/ui/views/controls/menu/menu_config.h b/ui/views/controls/menu/menu_config.h
|
| index 7cfd5c0c24fea5efa7b023aaecc17e6bdea9e96a..8c680ff45b0c0250361f780ebaeee436bd7ba0e6 100644
|
| --- a/ui/views/controls/menu/menu_config.h
|
| +++ b/ui/views/controls/menu/menu_config.h
|
| @@ -24,6 +24,11 @@ struct VIEWS_EXPORT MenuConfig {
|
| // Returns the single shared MenuConfig instance, creating if necessary.
|
| static const MenuConfig& instance();
|
|
|
| + // Returning true when the new menu style is used.
|
| + // TODO(skuhne): Once only the new menu style is used this function can get
|
| + // removed.
|
| + static const bool IsNewMenu();
|
| +
|
| // Font used by menus.
|
| gfx::Font font;
|
|
|
| @@ -81,9 +86,18 @@ struct VIEWS_EXPORT MenuConfig {
|
| // Width of the gutter. Only used if render_gutter is true.
|
| int gutter_width;
|
|
|
| - // Height of the separator.
|
| + // Height of a normal separator (ui::NORMAL_SEPARATOR).
|
| int separator_height;
|
|
|
| + // Height of a ui::UPPER_SEPARATOR.
|
| + int separator_upper_height;
|
| +
|
| + // Height of a ui::LOWER_SEPARATOR.
|
| + int separator_lower_height;
|
| +
|
| + // Height of a ui::SPACING_SEPARATOR.
|
| + int separator_spacing_height;
|
| +
|
| // Whether or not the gutter should be rendered. The gutter is specific to
|
| // Vista.
|
| bool render_gutter;
|
|
|