Commit 8d36d2a8 authored by Federico Paredes's avatar Federico Paredes Committed by Commit Bot

Added dark theme and accessibility colors to TooltipIcon objects.

Bug: 1126671
Change-Id: I86ae7c3ba040fad1c0a09ef646e73687b907dde1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2402278Reviewed-by: default avatarPeter Kasting <pkasting@chromium.org>
Commit-Queue: Federico Paredes <fedpar@microsoft.com>
Cr-Commit-Position: refs/heads/master@{#807061}
parent 562e1c3c
...@@ -194,6 +194,10 @@ base::Optional<SkColor> GetDarkSchemeColor(NativeTheme::ColorId color_id) { ...@@ -194,6 +194,10 @@ base::Optional<SkColor> GetDarkSchemeColor(NativeTheme::ColorId color_id) {
return gfx::kGoogleBlue800; return gfx::kGoogleBlue800;
// Tooltip // Tooltip
case NativeTheme::kColorId_TooltipIcon:
return SkColorSetA(gfx::kGoogleGrey200, 0xBD);
case NativeTheme::kColorId_TooltipIconHovered:
return SK_ColorWHITE;
case NativeTheme::kColorId_TooltipText: case NativeTheme::kColorId_TooltipText:
return SkColorSetA(gfx::kGoogleGrey200, 0xDE); return SkColorSetA(gfx::kGoogleGrey200, 0xDE);
...@@ -505,9 +509,9 @@ SkColor GetDefaultColor(NativeTheme::ColorId color_id, ...@@ -505,9 +509,9 @@ SkColor GetDefaultColor(NativeTheme::ColorId color_id,
return SkColorSetA(bg, 0xCC); return SkColorSetA(bg, 0xCC);
} }
case NativeTheme::kColorId_TooltipIcon: case NativeTheme::kColorId_TooltipIcon:
return SkColorSetARGB(0xBD, 0x44, 0x44, 0x44); return SkColorSetA(gfx::kGoogleGrey800, 0xBD);
case NativeTheme::kColorId_TooltipIconHovered: case NativeTheme::kColorId_TooltipIconHovered:
return SkColorSetARGB(0xBD, 0, 0, 0); return SkColorSetA(SK_ColorBLACK, 0xBD);
case NativeTheme::kColorId_TooltipText: case NativeTheme::kColorId_TooltipText:
return SkColorSetA(kPrimaryTextColor, 0xDE); return SkColorSetA(kPrimaryTextColor, 0xDE);
......
...@@ -623,6 +623,7 @@ base::Optional<SkColor> NativeThemeWin::GetPlatformHighContrastColor( ...@@ -623,6 +623,7 @@ base::Optional<SkColor> NativeThemeWin::GetPlatformHighContrastColor(
case kColorId_TableHeaderText: case kColorId_TableHeaderText:
case kColorId_TableGroupingIndicatorColor: case kColorId_TableGroupingIndicatorColor:
case kColorId_TableHeaderSeparator: case kColorId_TableHeaderSeparator:
case kColorId_TooltipIcon:
case kColorId_TooltipText: case kColorId_TooltipText:
case kColorId_ThrobberSpinningColor: case kColorId_ThrobberSpinningColor:
case kColorId_ThrobberLightColor: case kColorId_ThrobberLightColor:
...@@ -678,6 +679,7 @@ base::Optional<SkColor> NativeThemeWin::GetPlatformHighContrastColor( ...@@ -678,6 +679,7 @@ base::Optional<SkColor> NativeThemeWin::GetPlatformHighContrastColor(
case kColorId_FocusedMenuItemBackgroundColor: case kColorId_FocusedMenuItemBackgroundColor:
case kColorId_LabelTextSelectionBackgroundFocused: case kColorId_LabelTextSelectionBackgroundFocused:
case kColorId_TextfieldSelectionBackgroundFocused: case kColorId_TextfieldSelectionBackgroundFocused:
case kColorId_TooltipIconHovered:
case kColorId_TreeSelectionBackgroundFocused: case kColorId_TreeSelectionBackgroundFocused:
case kColorId_TreeSelectionBackgroundUnfocused: case kColorId_TreeSelectionBackgroundUnfocused:
case kColorId_TableSelectionBackgroundFocused: case kColorId_TableSelectionBackgroundFocused:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment