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

Unified Diff: ui/native_theme/fallback_theme.cc

Issue 795933009: [AiS] for desktop, two lines and font sytles (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Increase vertical spacing in suggestions 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
Index: ui/native_theme/fallback_theme.cc
diff --git a/ui/native_theme/fallback_theme.cc b/ui/native_theme/fallback_theme.cc
index 127243fdde09bf88e5507eaca712f2ca5819fb96..31468c600e3386d0741d3af10700a10fa1542799 100644
--- a/ui/native_theme/fallback_theme.cc
+++ b/ui/native_theme/fallback_theme.cc
@@ -89,6 +89,37 @@ SkColor FallbackTheme::GetSystemColor(ColorId color_id) const {
kResultsTableHoveredText, kResultsTableHoveredBackground, 0x34);
static const SkColor kResultsTabSelectedDivider = color_utils::AlphaBlend(
kResultsTableSelectedText, kTextfieldSelectionBackgroundFocused, 0x34);
+ // Answers
+ static const SkColor kAnswerNormalText =
Justin Donnelly 2015/03/13 21:08:33 I don't think it makes sense to define this as syn
dschuyler 2015/03/13 21:48:23 The reason I went with a separate list is that the
+ color_utils::AlphaBlend(SK_ColorBLACK, kTextfieldDefaultBackground, 0xDD);
Justin Donnelly 2015/03/13 21:08:33 How did you choose the alpha value? 0xDD is the m
dschuyler 2015/03/13 21:48:23 Yes, I used what was used previously. I don't kno
+ static const SkColor kAnswerNormalTextHovered = color_utils::AlphaBlend(
+ SK_ColorBLACK, kResultsTableHoveredBackground, 0xDD);
+ static const SkColor kAnswerNormalTextSelected = color_utils::AlphaBlend(
+ SK_ColorBLACK, kTextfieldSelectionBackgroundFocused, 0xDD);
+ static const SkColor kAnswerInfoText =
+ color_utils::AlphaBlend(SK_ColorGRAY, kTextfieldDefaultBackground, 0xDD);
+ static const SkColor kAnswerInfoTextHovered = color_utils::AlphaBlend(
+ SK_ColorGRAY, kResultsTableHoveredBackground, 0xDD);
+ static const SkColor kAnswerInfoTextSelected = color_utils::AlphaBlend(
+ SK_ColorGRAY, kTextfieldSelectionBackgroundFocused, 0xDD);
+ static const SkColor kAnswerLinkText =
+ color_utils::AlphaBlend(SK_ColorBLUE, kTextfieldDefaultBackground, 0xDD);
+ static const SkColor kAnswerLinkTextHovered = color_utils::AlphaBlend(
+ SK_ColorBLUE, kResultsTableHoveredBackground, 0xDD);
+ static const SkColor kAnswerLinkTextSelected = color_utils::AlphaBlend(
+ SK_ColorBLUE, kTextfieldSelectionBackgroundFocused, 0xDD);
+ static const SkColor kAnswerPositiveText =
+ color_utils::AlphaBlend(SK_ColorGREEN, kTextfieldDefaultBackground, 0xDD);
+ static const SkColor kAnswerPositiveTextHovered = color_utils::AlphaBlend(
+ SK_ColorGREEN, kResultsTableHoveredBackground, 0xDD);
+ static const SkColor kAnswerPositiveTextSelected = color_utils::AlphaBlend(
+ SK_ColorGREEN, kTextfieldSelectionBackgroundFocused, 0xDD);
+ static const SkColor kAnswerNegativeText =
+ color_utils::AlphaBlend(SK_ColorRED, kTextfieldDefaultBackground, 0xDD);
+ static const SkColor kAnswerNegativeTextHovered = color_utils::AlphaBlend(
+ SK_ColorRED, kResultsTableHoveredBackground, 0xDD);
+ static const SkColor kAnswerNegativeTextSelected = color_utils::AlphaBlend(
+ SK_ColorRED, kTextfieldSelectionBackgroundFocused, 0xDD);
SkColor color;
if (CommonThemeGetSystemColor(color_id, &color))
@@ -206,6 +237,38 @@ SkColor FallbackTheme::GetSystemColor(ColorId color_id) const {
case kColorId_ResultsTableSelectedDivider:
return kResultsTabSelectedDivider;
+ // Answers
+ case kColorId_AnswerNormalText:
+ return kAnswerNormalText;
+ case kColorId_AnswerNormalTextHovered:
+ return kAnswerNormalTextHovered;
+ case kColorId_AnswerNormalTextSelected:
+ return kAnswerNormalTextSelected;
+ case kColorId_AnswerInfoText:
+ return kAnswerInfoText;
+ case kColorId_AnswerInfoTextHovered:
+ return kAnswerInfoTextHovered;
+ case kColorId_AnswerInfoTextSelected:
+ return kAnswerInfoTextSelected;
+ case kColorId_AnswerLinkText:
+ return kAnswerLinkText;
+ case kColorId_AnswerLinkTextHovered:
+ return kAnswerLinkTextHovered;
+ case kColorId_AnswerLinkTextSelected:
+ return kAnswerLinkTextSelected;
+ case kColorId_AnswerPositiveText:
+ return kAnswerPositiveText;
+ case kColorId_AnswerPositiveTextHovered:
+ return kAnswerPositiveTextHovered;
+ case kColorId_AnswerPositiveTextSelected:
+ return kAnswerPositiveTextSelected;
+ case kColorId_AnswerNegativeText:
+ return kAnswerNegativeText;
+ case kColorId_AnswerNegativeTextHovered:
+ return kAnswerNegativeTextHovered;
+ case kColorId_AnswerNegativeTextSelected:
+ return kAnswerNegativeTextSelected;
+
default:
NOTREACHED();
break;

Powered by Google App Engine
This is Rietveld 408576698