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

Unified Diff: ui/native_theme/native_theme_win.cc

Issue 1020623002: [AiS] adding positive and negative theme values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added comments for positive and negative text Created 5 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 4429d6ba71e138521b4c631906b49c0620562c31..f6588dc2ec04b1ac9a3ea59f309aa343e142c0e1 100644
--- a/ui/native_theme/native_theme_win.cc
+++ b/ui/native_theme/native_theme_win.cc
@@ -20,6 +20,7 @@
#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/SkColor.h"
#include "third_party/skia/include/core/SkColorPriv.h"
#include "third_party/skia/include/core/SkShader.h"
#include "ui/gfx/color_utils.h"
@@ -607,8 +608,11 @@ SkColor NativeThemeWin::GetSystemColor(ColorId color_id) const {
case kColorId_ResultsTableSelectedBackground:
return system_colors_[COLOR_HIGHLIGHT];
case kColorId_ResultsTableNormalText:
- case kColorId_ResultsTableHoveredText:
return system_colors_[COLOR_WINDOWTEXT];
+ case kColorId_ResultsTableHoveredText:
+ return color_utils::GetReadableColor(
+ system_colors_[COLOR_WINDOWTEXT],
+ GetSystemColor(kColorId_ResultsTableHoveredBackground));
case kColorId_ResultsTableSelectedText:
return system_colors_[COLOR_HIGHLIGHTTEXT];
case kColorId_ResultsTableNormalDimmedText:
@@ -641,6 +645,25 @@ SkColor NativeThemeWin::GetSystemColor(ColorId color_id) const {
case kColorId_ResultsTableSelectedDivider:
return color_utils::AlphaBlend(system_colors_[COLOR_HIGHLIGHTTEXT],
system_colors_[COLOR_HIGHLIGHT], 0x34);
+ case kColorId_ResultsTablePositiveText:
+ return color_utils::GetReadableColor(SK_ColorGREEN,
+ system_colors_[COLOR_WINDOW]);
+ case kColorId_ResultsTablePositiveHoveredText:
+ return color_utils::GetReadableColor(
+ SK_ColorGREEN,
+ GetSystemColor(kColorId_ResultsTableHoveredBackground));
+ case kColorId_ResultsTablePositiveSelectedText:
+ return color_utils::GetReadableColor(SK_ColorGREEN,
+ system_colors_[COLOR_HIGHLIGHT]);
+ case kColorId_ResultsTableNegativeText:
+ return color_utils::GetReadableColor(SK_ColorRED,
+ system_colors_[COLOR_WINDOW]);
+ case kColorId_ResultsTableNegativeHoveredText:
+ return color_utils::GetReadableColor(
+ SK_ColorRED, GetSystemColor(kColorId_ResultsTableHoveredBackground));
+ case kColorId_ResultsTableNegativeSelectedText:
+ return color_utils::GetReadableColor(SK_ColorRED,
+ system_colors_[COLOR_HIGHLIGHT]);
}
NOTREACHED();
return kInvalidColorIdColor;
« 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