Native themes: Add MenuItemSubtitleColor

ui/views/controls/menu/menu_item_view.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/controls/menu/menu_item_view.h"
 
 #include <stddef.h>
 
 #include "base/i18n/case_conversion.h"
 #include "base/macros.h"
@@ skipping 827 matching lines @@
   int flags = GetDrawStringFlags();
   if (mode == PB_FOR_DRAG)
     flags |= gfx::Canvas::NO_SUBPIXEL_RENDERING;
   canvas->DrawStringRectWithFlags(title(), font_list, fg_color, text_bounds,
                                   flags);
   if (!subtitle_.empty()) {
     canvas->DrawStringRectWithFlags(
         subtitle_,
         font_list,
         GetNativeTheme()->GetSystemColor(
-            ui::NativeTheme::kColorId_ButtonDisabledColor),
+            ui::NativeTheme::kColorId_MenuItemSubtitleColor),
         text_bounds + gfx::Vector2d(0, font_list.GetHeight()),
         flags);
   }
 
   PaintMinorText(canvas, render_selection);
 
   // Render the submenu indicator (arrow).
   if (HasSubmenu()) {
     gfx::ImageSkia arrow = GetSubmenuArrowImage(icon_color);
     gfx::Rect arrow_bounds(this->width() - config.arrow_width -
@@ skipping 25 matching lines @@
   flags &= ~(gfx::Canvas::TEXT_ALIGN_RIGHT | gfx::Canvas::TEXT_ALIGN_LEFT);
   if (base::i18n::IsRTL())
     flags |= gfx::Canvas::TEXT_ALIGN_LEFT;
   else
     flags |= gfx::Canvas::TEXT_ALIGN_RIGHT;
   canvas->DrawStringRectWithFlags(
       minor_text,
       GetFontList(),
       GetNativeTheme()->GetSystemColor(render_selection ?
           ui::NativeTheme::kColorId_SelectedMenuItemForegroundColor :
-          ui::NativeTheme::kColorId_ButtonDisabledColor),
+          ui::NativeTheme::kColorId_MenuItemSubtitleColor),
       accel_bounds,
       flags);
 }
 
 void MenuItemView::DestroyAllMenuHosts() {
   if (!HasSubmenu())
     return;
 
   submenu_->Close();
   for (int i = 0, item_count = submenu_->GetMenuItemCount(); i < item_count;
@@ skipping 173 matching lines @@
     } else {
       const Type& type = menu_item->GetType();
       if (type == CHECKBOX || type == RADIO)
         return true;
     }
   }
   return false;
 }
 
 }  // namespace views