Simplify life for people trying to pick a "readable" foreground color by not ...

chrome/browser/views/location_bar_view.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/views/location_bar_view.h"
 
 #if defined(OS_LINUX)
 #include <gtk/gtk.h>
 #endif
 
@@ skipping 220 matching lines @@
 #endif
     colors[SECURE][BACKGROUND] = SkColorSetRGB(255, 245, 195);
     colors[SECURE][TEXT] = SkColorSetRGB(0, 0, 0);
     colors[SECURE][SELECTED_TEXT] = 0;  // Unused
     colors[NOT_SECURE][DEEMPHASIZED_TEXT] =
         color_utils::AlphaBlend(colors[NOT_SECURE][TEXT],
                                 colors[NOT_SECURE][BACKGROUND], 128);
     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;
   }
 
   return colors[is_secure ? SECURE : NOT_SECURE][kind];
 }
 
 void LocationBarView::Update(const TabContents* tab_for_state_restoring) {
   SetSecurityIcon(model_->GetIcon());
   RefreshPageActionViews();
@@ skipping 1054 matching lines @@
 }
 
 int LocationBarView::PageActionVisibleCount() {
   int result = 0;
   for (size_t i = 0; i < page_action_image_views_.size(); i++) {
     if (page_action_image_views_[i]->IsVisible())
       ++result;
   }
   return result;
 }