Tweaks for the merged menu:

. makes the menu show the same fonts regardless of whether the item
  has children.
. adds text color to MenuConfig. I'm going to use this for the buttons
  added to the menu.
. Changes TextButton to update text_size_ when the font changes.
. Changes TextButton to allow you to specify how accelerators are
  shown.
. Nukes TextButton::OnMousePressed as it's not needed (super
  implementation does the right thing and updates state the
  TextButton::OnMousePressed wasn't).
. Changes accelerator to have constructor taking keycode and modifiers.

BUG=45734
TEST=none

Review URL: http://codereview.chromium.org/2833013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@50108 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 3 deletions

diff --git a/views/controls/menu/menu_config.h b/views/controls/menu/menu_config.h
index cd41fea..9a9a60e 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;