Index: ui/native_theme/native_theme_win.cc |
diff --git a/ui/native_theme/native_theme_win.cc b/ui/native_theme/native_theme_win.cc |
index 69edbb998fc1909e03f89377442b52670a8f5d63..83b64fefe979245e7e320e2b0241e35f6f31bd55 100644 |
--- a/ui/native_theme/native_theme_win.cc |
+++ b/ui/native_theme/native_theme_win.cc |
@@ -602,6 +602,49 @@ SkColor NativeThemeWin::GetSystemColor(ColorId color_id) const { |
case kColorId_TableGroupingIndicatorColor: |
return system_colors_[COLOR_GRAYTEXT]; |
+ // Results Tables |
+ case kColorId_ResultsTableNormalBackground: |
+ return system_colors_[COLOR_WINDOW]; |
+ case kColorId_ResultsTableHoveredBackground: |
+ return color_utils::AlphaBlend(system_colors_[COLOR_HIGHLIGHT], |
msw
2014/04/03 18:53:53
Can we merge any blending code/rules across native
Elliot Glaysher
2014/04/03 20:25:27
Not easily. The common_theme.h stuff is set up to
msw
2014/04/03 20:30:25
I guess I was wondering if the NativeTheme could j
|
+ system_colors_[COLOR_WINDOW], 64); |
+ case kColorId_ResultsTableSelectedBackground: |
+ return system_colors_[COLOR_HIGHLIGHT]; |
+ case kColorId_ResultsTableNormalText: |
+ case kColorId_ResultsTableHoveredText: |
+ return system_colors_[COLOR_WINDOWTEXT]; |
+ case kColorId_ResultsTableSelectedText: |
+ return system_colors_[COLOR_HIGHLIGHTTEXT]; |
+ case kColorId_ResultsTableNormalDimmedText: |
+ return color_utils::AlphaBlend(system_colors_[COLOR_WINDOWTEXT], |
+ system_colors_[COLOR_WINDOW], 128); |
+ case kColorId_ResultsTableHoveredDimmedText: |
+ return color_utils::AlphaBlend( |
+ system_colors_[COLOR_WINDOWTEXT], |
+ GetSystemColor(kColorId_ResultsTableHoveredBackground), 128); |
+ case kColorId_ResultsTableSelectedDimmedText: |
+ return color_utils::AlphaBlend(system_colors_[COLOR_HIGHLIGHTTEXT], |
+ system_colors_[COLOR_HIGHLIGHT], 128); |
+ case kColorId_ResultsTableNormalUrl: |
+ return color_utils::GetReadableColor(SkColorSetRGB(0, 128, 0), |
+ system_colors_[COLOR_WINDOW]); |
+ case kColorId_ResultsTableHoveredUrl: |
+ return color_utils::GetReadableColor( |
+ SkColorSetRGB(0, 128, 0), |
+ GetSystemColor(kColorId_ResultsTableHoveredBackground)); |
+ case kColorId_ResultsTableSelectedUrl: |
+ return color_utils::GetReadableColor(SkColorSetRGB(0, 128, 0), |
+ system_colors_[COLOR_HIGHLIGHT]); |
+ case kColorId_ResultsTableNormalDivider: |
+ return color_utils::AlphaBlend(system_colors_[COLOR_WINDOWTEXT], |
+ system_colors_[COLOR_WINDOW], 0x34); |
msw
2014/04/03 18:53:53
nit: consistency in hex/decimal blending values wo
Elliot Glaysher
2014/04/03 20:25:27
Done in all the NativeTheme instances.
|
+ case kColorId_ResultsTableHoveredDivider: |
+ return color_utils::AlphaBlend( |
+ system_colors_[COLOR_WINDOWTEXT], |
+ GetSystemColor(kColorId_ResultsTableHoveredBackground), 0x34); |
+ case kColorId_ResultsTableSelectedDivider: |
+ return color_utils::AlphaBlend(system_colors_[COLOR_HIGHLIGHTTEXT], |
+ system_colors_[COLOR_HIGHLIGHT], 0x34); |
default: |
NOTREACHED(); |
break; |