Make all the menu UI consitent with the new chromeos menu spec.

ui/gfx/native_theme_win.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/gfx/native_theme_win.h"
 
 #include <windows.h>
 #include <uxtheme.h>
 #include <vsstyle.h>
 #include <vssym32.h>
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/memory/scoped_handle.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/win/scoped_gdi_object.h"
 #include "base/win/scoped_hdc.h"
 #include "base/win/scoped_select_object.h"
 #include "base/win/windows_version.h"
 #include "skia/ext/platform_canvas.h"
 #include "skia/ext/skia_utils_win.h"
 #include "third_party/skia/include/core/SkCanvas.h"
 #include "third_party/skia/include/core/SkColorPriv.h"
 #include "third_party/skia/include/core/SkShader.h"
+#include "ui/gfx/color_utils.h"
 #include "ui/gfx/gdi_util.h"
 #include "ui/gfx/rect.h"
 
 namespace {
 
 // TODO: Obtain the correct colors using GetSysColor.
 // Theme colors returned by GetSystemColor().
 const SkColor kInvalidColorIdColor = SkColorSetRGB(255, 0, 128);
 // Dialogs:
 const SkColor kDialogBackgroundColor = SkColorSetRGB(200, 200, 200);
 // FocusableBorder (should be unused on Win):
 const SkColor kFocusedBorderColor= SkColorSetRGB(0x4D, 0x90, 0xFE);
 const SkColor kUnfocusedBorderColor = SkColorSetRGB(0xD9, 0xD9, 0xD9);
 // TextButton:
 const SkColor kTextButtonBackgroundColor = SkColorSetRGB(0xde, 0xde, 0xde);
 const SkColor kTextButtonEnabledColor = SkColorSetRGB(6, 45, 117);
 const SkColor kTextButtonDisabledColor = SkColorSetRGB(161, 161, 146);
 const SkColor kTextButtonHighlightColor = SkColorSetARGB(200, 255, 255, 255);
 const SkColor kTextButtonHoverColor = kTextButtonEnabledColor;
 // MenuItem:
 const SkColor kEnabledMenuItemForegroundColor = kTextButtonEnabledColor;
 const SkColor kDisabledMenuItemForegroundColor = kTextButtonDisabledColor;
 const SkColor kFocusedMenuItemBackgroundColor = SkColorSetRGB(246, 249, 253);
+// Label:
+const SkColor kLabelEnabledColor = color_utils::GetSysSkColor(COLOR_WINDOWTEXT);
+const SkColor kLabelDisabledColor = color_utils::GetSysSkColor(COLOR_GRAYTEXT);
+const SkColor kLabelBackgroundColor = color_utils::GetSysSkColor(COLOR_WINDOW);
 // Textfield:
 const SkColor kTextfieldDefaultColor = SK_ColorBLACK;
 const SkColor kTextfieldDefaultBackground = SK_ColorWHITE;
 const SkColor kTextfieldSelectionColor = SK_ColorWHITE;
 const SkColor kTextfieldSelectionBackgroundFocused =
     SkColorSetRGB(0x1D, 0x90, 0xFF);
 const SkColor kTextfieldSelectionBackgroundUnfocused = SK_ColorLTGRAY;
 
 SkColor WinColorToSkColor(COLORREF color) {
   return SkColorSetRGB(GetRValue(color), GetGValue(color), GetBValue(color));
@@ skipping 334 matching lines @@
       return kTextButtonHoverColor;
 
     // MenuItem
     case kColorId_EnabledMenuItemForegroundColor:
       return kEnabledMenuItemForegroundColor;
     case kColorId_DisabledMenuItemForegroundColor:
       return kDisabledMenuItemForegroundColor;
     case kColorId_FocusedMenuItemBackgroundColor:
       return kFocusedMenuItemBackgroundColor;
 
+    // Label
+    case kColorId_LabelEnabledColor:
+      return kLabelEnabledColor;
+    case kColorId_LabelDisabledColor:
+      return kLabelDisabledColor;
+    case kColorId_LabelBackgroundColor:
+      return kLabelBackgroundColor;
+
     // Textfield
     case kColorId_TextfieldDefaultColor:
       return kTextfieldDefaultColor;
     case kColorId_TextfieldDefaultBackground:
       return kTextfieldDefaultBackground;
     case kColorId_TextfieldSelectionColor:
       return kTextfieldSelectionColor;
     case kColorId_TextfieldSelectionBackgroundFocused:
       return kTextfieldSelectionBackgroundFocused;
     case kColorId_TextfieldSelectionBackgroundUnfocused:
@@ skipping 1342 matching lines @@
     handle = open_theme_(NULL, L"Spin");
     break;
   default:
     NOTREACHED();
   }
   theme_handles_[theme_name] = handle;
   return handle;
 }
 
 }  // namespace gfx