Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(388)

Unified Diff: views/controls/menu/menu_config.h

Issue 2833013: Tweaks for the merged menu: (Closed)
Patch Set: Created 10 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « views/controls/button/text_button.cc ('k') | views/controls/menu/menu_config_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: views/controls/menu/menu_config.h
diff --git a/views/controls/menu/menu_config.h b/views/controls/menu/menu_config.h
index cd41fea8f683c3bbecaae652cdf219ed3a4ed11f..9a9a60e2c2c804fa655d356410555407d06f084d 100644
--- a/views/controls/menu/menu_config.h
+++ b/views/controls/menu/menu_config.h
@@ -6,6 +6,7 @@
#define VIEWS_CONTROLS_MENU_MENU_CONFIG_H_
#include "gfx/font.h"
+#include "third_party/skia/include/core/SkColor.h"
namespace views {
@@ -13,7 +14,8 @@ namespace views {
// the MenuConfig for the current platform.
struct MenuConfig {
MenuConfig()
- : item_top_margin(3),
+ : text_color(SK_ColorBLACK),
+ item_top_margin(3),
item_bottom_margin(4),
item_no_icon_top_margin(1),
item_no_icon_bottom_margin(3),
@@ -44,8 +46,8 @@ struct MenuConfig {
// Font used by menus.
gfx::Font font;
- // Font used when the menu has children.
- gfx::Font font_with_controls;
+ // Normal text color.
+ SkColor text_color;
// Margins between the top of the item and the label.
int item_top_margin;
« no previous file with comments | « views/controls/button/text_button.cc ('k') | views/controls/menu/menu_config_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698