Chromium Code Reviews| Index: chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc |
| diff --git a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc |
| index 3dec05e03c2df7ed5ca6e361999b24e5561e8570..b6cd6af603c99130b390a29530f9b909445ece20 100644 |
| --- a/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc |
| +++ b/chrome/browser/ui/libgtk2ui/native_theme_gtk2.cc |
| @@ -23,6 +23,8 @@ namespace { |
| const SkColor kInvalidColorIdColor = SkColorSetRGB(255, 0, 128); |
| const GdkColor kURLTextColor = GDK_COLOR_RGB(0x00, 0x88, 0x00); |
| +const GdkColor kPositiveTextColor = GDK_COLOR_RGB(0x00, 0xff, 0x00); |
|
Peter Kasting
2015/03/17 22:01:44
Nit: kURLTextColor is used in multiple functions a
dschuyler
2015/03/17 22:57:55
Done.
|
| +const GdkColor kNegativeTextColor = GDK_COLOR_RGB(0xff, 0x00, 0x00); |
| GdkColor GdkAlphaBlend(GdkColor foreground, |
| GdkColor background, |
| @@ -93,6 +95,12 @@ GdkColor SelectedURLColor(GdkColor foreground, GdkColor background) { |
| return libgtk2ui::SkColorToGdkColor(color_utils::HSLToSkColor(output, 255)); |
| } |
| +GdkColor GetReadableColor(const GdkColor& color, const GdkColor& background) { |
| + return libgtk2ui::SkColorToGdkColor( |
| + color_utils::GetReadableColor(libgtk2ui::GdkColorToSkColor(color), |
| + libgtk2ui::GdkColorToSkColor(background))); |
| +} |
| + |
| } // namespace |
| @@ -373,6 +381,30 @@ GdkColor NativeThemeGtk2::GetSystemGdkColor(ColorId color_id) const { |
| return GdkAlphaBlend(win_style->text[GTK_STATE_SELECTED], |
| win_style->bg[GTK_STATE_SELECTED], 0x34); |
| } |
| + case kColorId_ResultsTablePositiveText: { |
| + return GetReadableColor(kPositiveTextColor, |
| + GetEntryStyle()->base[GTK_STATE_NORMAL]); |
| + } |
| + case kColorId_ResultsTablePositiveHoveredText: { |
| + return GetReadableColor(kPositiveTextColor, |
| + GetEntryStyle()->base[GTK_STATE_PRELIGHT]); |
| + } |
| + case kColorId_ResultsTablePositiveSelectedText: { |
| + return GetReadableColor(kPositiveTextColor, |
| + GetEntryStyle()->base[GTK_STATE_SELECTED]); |
| + } |
| + case kColorId_ResultsTableNegativeText: { |
| + return GetReadableColor(kNegativeTextColor, |
| + GetEntryStyle()->base[GTK_STATE_NORMAL]); |
| + } |
| + case kColorId_ResultsTableNegativeHoveredText: { |
| + return GetReadableColor(kNegativeTextColor, |
| + GetEntryStyle()->base[GTK_STATE_PRELIGHT]); |
| + } |
| + case kColorId_ResultsTableNegativeSelectedText: { |
| + return GetReadableColor(kNegativeTextColor, |
| + GetEntryStyle()->base[GTK_STATE_SELECTED]); |
| + } |
| case kColorId_NumColors: |
| NOTREACHED(); |
| break; |