Native themes: Add MenuItemSubtitleColor

MenuItemView was using ButtonDisabledColor for coloring menuitem
subtext (usually used for accelerator shortcuts).  However, Adwaita on
Gtk3.0 uses the same color for disabled button text as for menu
backgrounds, meaning menuitem subtext appeared invisible.  This CL
adds MenuItemSubtitleColor to fix this issue.

BUG=132847
R=sky@chromium.org,erg@chromium.org

Review-Url: https://codereview.chromium.org/2575343005
Cr-Commit-Position: refs/heads/master@{#439854}

chrome/browser/ui/libgtkui/native_theme_gtk2.cc

@@ -153,6 +153,7 @@ SkColor NativeThemeGtk2::GetSystemColor(ColorId color_id) const {
 
     case kColorId_EnabledMenuItemForegroundColor:
       return GetTextColor(GetMenuItem(), NORMAL);
+    case kColorId_MenuItemSubtitleColor:
     case kColorId_DisabledMenuItemForegroundColor:
       return GetTextColor(GetMenuItem(), INSENSITIVE);
     case kColorId_FocusedMenuButtonBorderColor:

chrome/browser/ui/libgtkui/native_theme_gtk3.cc

@@ -195,6 +195,8 @@ SkColor NativeThemeGtk3::LookupGtkThemeColor(ColorId color_id) const {
       return GetFGColor("menu menuitem label", GTK_STATE_FLAG_SELECTED);
     case kColorId_DisabledMenuItemForegroundColor:
       return GetFGColor("menu menuitem label", GTK_STATE_FLAG_INSENSITIVE);
+    case kColorId_MenuItemSubtitleColor:
+      return GetFGColor("menu menuitem accelerator", GTK_STATE_FLAG_NORMAL);
     case kColorId_MenuSeparatorColor:
     // MenuButton borders are used the same way as menu separtors in Chrome.
     case kColorId_EnabledMenuButtonBorderColor:

ui/native_theme/common_theme.cc

@@ -183,6 +183,9 @@ SkColor GetAuraColor(NativeTheme::ColorId color_id,
       return kEnabledMenuItemForegroundColor;
     case NativeTheme::kColorId_DisabledMenuItemForegroundColor:
       return kDisabledMenuItemForegroundColor;
+    case NativeTheme::kColorId_MenuItemSubtitleColor:
+      return base_theme->GetSystemColor(
+          NativeTheme::kColorId_DisabledMenuItemForegroundColor);
 
     // Label
     case NativeTheme::kColorId_LabelEnabledColor:

ui/native_theme/native_theme.h

@@ -276,6 +276,7 @@ class NATIVE_THEME_EXPORT NativeTheme {
     kColorId_DisabledMenuItemForegroundColor,
     kColorId_SelectedMenuItemForegroundColor,
     kColorId_FocusedMenuItemBackgroundColor,
+    kColorId_MenuItemSubtitleColor,
     kColorId_MenuSeparatorColor,
     kColorId_MenuBackgroundColor,
     kColorId_MenuBorderColor,

ui/native_theme/native_theme_dark_aura.cc

@@ -112,6 +112,7 @@ SkColor NativeThemeDarkAura::GetSystemColor(ColorId color_id) const {
     case kColorId_DisabledMenuItemForegroundColor:
     case kColorId_SelectedMenuItemForegroundColor:
     case kColorId_FocusedMenuItemBackgroundColor:
+    case kColorId_MenuItemSubtitleColor:
     case kColorId_MenuSeparatorColor:
     case kColorId_MenuBackgroundColor:
     case kColorId_MenuBorderColor:

ui/views/controls/menu/menu_item_view.cc

@@ -845,7 +845,7 @@ void MenuItemView::PaintButton(gfx::Canvas* canvas, PaintButtonMode mode) {
         subtitle_,
         font_list,
         GetNativeTheme()->GetSystemColor(
-            ui::NativeTheme::kColorId_ButtonDisabledColor),
+            ui::NativeTheme::kColorId_MenuItemSubtitleColor),
         text_bounds + gfx::Vector2d(0, font_list.GetHeight()),
         flags);
   }
@@ -891,7 +891,7 @@ void MenuItemView::PaintMinorText(gfx::Canvas* canvas,
       GetFontList(),
       GetNativeTheme()->GetSystemColor(render_selection ?
           ui::NativeTheme::kColorId_SelectedMenuItemForegroundColor :
-          ui::NativeTheme::kColorId_ButtonDisabledColor),
+          ui::NativeTheme::kColorId_MenuItemSubtitleColor),
       accel_bounds,
       flags);
 }