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

Unified Diff: ui/native_theme/fallback_theme.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 | « chrome/browser/ui/views/omnibox/omnibox_result_view.cc ('k') | ui/native_theme/native_theme.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/native_theme/fallback_theme.cc
diff --git a/ui/native_theme/fallback_theme.cc b/ui/native_theme/fallback_theme.cc
index 11cac351498fbb50f1a39d4e28ccd15a26ce94d2..918a5b3cbebc5f1ab56bd5729d276654c347b758 100644
--- a/ui/native_theme/fallback_theme.cc
+++ b/ui/native_theme/fallback_theme.cc
@@ -80,6 +80,31 @@ SkColor FallbackTheme::GetSystemColor(ColorId color_id) const {
SkColorSetRGB(0xEE, 0xEE, 0xEE);
static const SkColor kTableGroupingIndicatorColor =
SkColorSetRGB(0xCC, 0xCC, 0xCC);
+ // Results Tables
+ static const SkColor kResultsTableHoveredBackground =
+ color_utils::AlphaBlend(kTextfieldSelectionBackgroundFocused,
+ kTextfieldDefaultBackground, 0x40);
+ static const SkColor kResultsTableNormalText = color_utils::AlphaBlend(
+ SK_ColorBLACK, kTextfieldDefaultBackground, 0xDD);
+ static const SkColor kResultsTableHoveredText = color_utils::AlphaBlend(
+ SK_ColorBLACK, kResultsTableHoveredBackground, 0xDD);
+ static const SkColor kResultsTableSelectedText = color_utils::AlphaBlend(
+ SK_ColorBLACK, kTextfieldSelectionBackgroundFocused, 0xDD);
+ static const SkColor kResultsTableNormalDimmedText = color_utils::AlphaBlend(
+ SK_ColorBLACK, kTextfieldDefaultBackground, 0xBB);
+ static const SkColor kResultsTableHoveredDimmedText = color_utils::AlphaBlend(
+ SK_ColorBLACK, kResultsTableHoveredBackground, 0xBB);
+ static const SkColor kResultsTableSelectedDimmedText =
+ color_utils::AlphaBlend(
+ SK_ColorBLACK, kTextfieldSelectionBackgroundFocused, 0xBB);
+ static const SkColor kResultsTableSelectedOrHoveredUrl =
+ SkColorSetARGB(0xff, 0x00, 0x66, 0x22);
+ static const SkColor kResultsTableNormalDivider = color_utils::AlphaBlend(
+ kResultsTableNormalText, kTextfieldDefaultBackground, 0x34);
+ static const SkColor kResultsTableHoveredDivider = color_utils::AlphaBlend(
+ kResultsTableHoveredText, kResultsTableHoveredBackground, 0x34);
+ static const SkColor kResultsTabSelectedDivider = color_utils::AlphaBlend(
+ kResultsTableSelectedText, kTextfieldSelectionBackgroundFocused, 0x34);
SkColor color;
if (CommonThemeGetSystemColor(color_id, &color))
@@ -184,6 +209,37 @@ SkColor FallbackTheme::GetSystemColor(ColorId color_id) const {
case kColorId_TableGroupingIndicatorColor:
return kTableGroupingIndicatorColor;
+ // Results Tables
+ case kColorId_ResultsTableNormalBackground:
+ return kTextfieldDefaultBackground;
+ case kColorId_ResultsTableHoveredBackground:
+ return kResultsTableHoveredBackground;
+ case kColorId_ResultsTableSelectedBackground:
+ return kTextfieldSelectionBackgroundFocused;
+ case kColorId_ResultsTableNormalText:
+ return kResultsTableNormalText;
+ case kColorId_ResultsTableHoveredText:
+ return kResultsTableHoveredText;
+ case kColorId_ResultsTableSelectedText:
+ return kResultsTableSelectedText;
+ case kColorId_ResultsTableNormalDimmedText:
+ return kResultsTableNormalDimmedText;
+ case kColorId_ResultsTableHoveredDimmedText:
+ return kResultsTableHoveredDimmedText;
+ case kColorId_ResultsTableSelectedDimmedText:
+ return kResultsTableSelectedDimmedText;
+ case kColorId_ResultsTableNormalUrl:
+ return kTextfieldSelectionColor;
+ case kColorId_ResultsTableHoveredUrl:
+ case kColorId_ResultsTableSelectedUrl:
+ return kResultsTableSelectedOrHoveredUrl;
+ case kColorId_ResultsTableNormalDivider:
+ return kResultsTableNormalDivider;
+ case kColorId_ResultsTableHoveredDivider:
+ return kResultsTableHoveredDivider;
+ case kColorId_ResultsTableSelectedDivider:
+ return kResultsTabSelectedDivider;
+
case kColorId_MenuBackgroundColor:
return kMenuBackgroundColor;
case kColorId_MenuBorderColor:
« no previous file with comments | « chrome/browser/ui/views/omnibox/omnibox_result_view.cc ('k') | ui/native_theme/native_theme.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698