Factor more colors into NativeTheme.

ui/gfx/native_theme_win.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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/gdi_util.h"
 #include "ui/gfx/rect.h"
 
 namespace {
 
+// 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);
 
 SkColor WinColorToSkColor(COLORREF color) {
   return SkColorSetRGB(GetRValue(color), GetGValue(color), GetBValue(color));
 }
 
 void SetCheckerboardShader(SkPaint* paint, const RECT& align_rect) {
   // Create a 2x2 checkerboard pattern using the 3D face and highlight colors.
   SkColor face = skia::COLORREFToSkColor(GetSysColor(COLOR_3DFACE));
   SkColor highlight = skia::COLORREFToSkColor(GetSysColor(COLOR_3DHILIGHT));
   SkColor buffer[] = { face, highlight, highlight, face };
@@ skipping 300 matching lines @@
     case kSliderThumb:
     default:
       // While transitioning NativeThemeWin to the single Paint() entry point,
       // unsupported parts will DCHECK here.
       DCHECK(false);
   }
 }
 
 SkColor NativeThemeWin::GetSystemColor(ColorId color_id) const {
   switch (color_id) {
+
+    // Dialogs
     case kColorId_DialogBackground:
       // TODO(benrg): Should this use the new Windows theme functions? The old
       // code in DialogClientView::OnPaint used GetSysColor(COLOR_3DFACE).
       return WinColorToSkColor(GetSysColor(COLOR_3DFACE));
+
+    // TextButton
+    case kColorId_TextButtonBackgroundColor:
+      return kTextButtonBackgroundColor;
+    case kColorId_TextButtonEnabledColor:
+      return kTextButtonEnabledColor;
+    case kColorId_TextButtonDisabledColor:
+      return kTextButtonDisabledColor;
+    case kColorId_TextButtonHighlightColor:
+      return kTextButtonHighlightColor;
+    case kColorId_TextButtonHoverColor:
+      return kTextButtonHoverColor;
+
+    // MenuItem
+    case kColorId_EnabledMenuItemForegroundColor:
+      return kEnabledMenuItemForegroundColor;
+    case kColorId_DisabledMenuItemForegroundColor:
+      return kDisabledMenuItemForegroundColor;
+    case kColorId_FocusedMenuItemBackgroundColor:
+      return kFocusedMenuItemBackgroundColor;
+
     default:
       NOTREACHED() << "Invalid color_id: " << color_id;
       break;
   }
   return kInvalidColorIdColor;
 }
 
 void NativeThemeWin::PaintToNonPlatformCanvas(SkCanvas* canvas,
                                               Part part,
                                               State state,
@@ skipping 1329 matching lines @@
     handle = open_theme_(NULL, L"Spin");
     break;
   default:
     NOTREACHED();
   }
   theme_handles_[theme_name] = handle;
   return handle;
 }
 
 }  // namespace gfx