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

Unified Diff: chrome/browser/views/location_bar_view.cc

Issue 220029: Simplify life for people trying to pick a "readable" foreground color by not ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 3 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: chrome/browser/views/location_bar_view.cc
===================================================================
--- chrome/browser/views/location_bar_view.cc (revision 27030)
+++ chrome/browser/views/location_bar_view.cc (working copy)
@@ -238,27 +238,15 @@
colors[SECURE][DEEMPHASIZED_TEXT] =
color_utils::AlphaBlend(colors[SECURE][TEXT],
colors[SECURE][BACKGROUND], 128);
- const SkColor kDarkNotSecureText = SkColorSetRGB(200, 0, 0);
- const SkColor kLightNotSecureText = SkColorSetRGB(255, 55, 55);
- colors[NOT_SECURE][SECURITY_TEXT] =
- color_utils::PickMoreReadableColor(kDarkNotSecureText,
- kLightNotSecureText,
- colors[NOT_SECURE][BACKGROUND]);
+ colors[NOT_SECURE][SECURITY_TEXT] = color_utils::GetReadableColor(
+ SkColorSetRGB(200, 0, 0), colors[NOT_SECURE][BACKGROUND]);
colors[SECURE][SECURITY_TEXT] = SkColorSetRGB(0, 150, 20);
colors[NOT_SECURE][SECURITY_INFO_BUBBLE_TEXT] =
colors[NOT_SECURE][SECURITY_TEXT];
- const SkColor kDarkSecureInfoBubbleText = SkColorSetRGB(0, 153, 51);
- const SkColor kLightSecureInfoBubbleText = SkColorSetRGB(102, 255, 152);
- colors[SECURE][SECURITY_INFO_BUBBLE_TEXT] =
- color_utils::PickMoreReadableColor(kDarkSecureInfoBubbleText,
- kLightSecureInfoBubbleText,
- colors[NOT_SECURE][BACKGROUND]);
- const SkColor kDarkSchemeStrikeout = SkColorSetRGB(210, 0, 0);
- const SkColor kLightSchemeStrikeout = SkColorSetRGB(255, 45, 45);
- colors[NOT_SECURE][SCHEME_STRIKEOUT] =
- color_utils::PickMoreReadableColor(kDarkSchemeStrikeout,
- kLightSchemeStrikeout,
- colors[NOT_SECURE][BACKGROUND]);
+ colors[SECURE][SECURITY_INFO_BUBBLE_TEXT] = color_utils::GetReadableColor(
+ SkColorSetRGB(0, 153, 51), colors[NOT_SECURE][BACKGROUND]);
+ colors[NOT_SECURE][SCHEME_STRIKEOUT] = color_utils::GetReadableColor(
+ SkColorSetRGB(210, 0, 0), colors[NOT_SECURE][BACKGROUND]);
colors[SECURE][SCHEME_STRIKEOUT] = 0; // Unused
initialized = true;
}

Powered by Google App Engine
This is Rietveld 408576698