Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1048)

Unified Diff: ui/native_theme/native_theme_win.cc

Issue 222613005: views: Fix linux omnibox colors by refactoring omnibox_result_view.cc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Move table out of method so arraysize() works. Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/native_theme/native_theme.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..a09be6c30e74669915ba344663dfa945d381e572 100644
--- a/ui/native_theme/native_theme_win.cc
+++ b/ui/native_theme/native_theme_win.cc
@@ -602,6 +602,50 @@ 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],
+ system_colors_[COLOR_WINDOW], 0x40);
+ 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], 0x80);
+ case kColorId_ResultsTableHoveredDimmedText:
+ return color_utils::AlphaBlend(
+ system_colors_[COLOR_WINDOWTEXT],
+ GetSystemColor(kColorId_ResultsTableHoveredBackground), 0x80);
+ case kColorId_ResultsTableSelectedDimmedText:
+ return color_utils::AlphaBlend(system_colors_[COLOR_HIGHLIGHTTEXT],
+ system_colors_[COLOR_HIGHLIGHT], 0x80);
+ 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);
+ 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;
« no previous file with comments | « ui/native_theme/native_theme.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698