Use the system WINDOWTEXT color for labels, instead of black. Also use the system WINDOW color for InfoBubbles, not white. Several places are made to explicitly use black labels where that's correct or respecting system colors is a non-trivial fix (bugs filed for most).

Also, apparently I didn't get all my cleanup changes in the last patch, oops.

BUG=92,21027
TEST=Set theme to high-contrast black on white, check that most pieces of chrome UI have readable text
Review URL: http://codereview.chromium.org/237005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@27196 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 8 insertions, 4 deletions

diff --git a/chrome/browser/views/bookmark_bubble_view.cc b/chrome/browser/views/bookmark_bubble_view.cc
index 6a48deb..c85052f 100644
--- a/chrome/browser/views/bookmark_bubble_view.cc
+++ b/chrome/browser/views/bookmark_bubble_view.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/views/bookmark_bubble_view.h"
 
 #include "app/gfx/canvas.h"
+#include "app/gfx/color_utils.h"
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/keyboard_codes.h"
@@ -33,9 +34,6 @@ using views::Link;
 using views::NativeButton;
 using views::View;
 
-// Color of the title.
-static const SkColor kTitleColor = SkColorSetRGB(6, 45, 117);
-
 // Padding between "Title:" and the actual title.
 static const int kTitlePadding = 4;
 
@@ -226,9 +224,15 @@ BookmarkBubbleView::BookmarkBubbleView(InfoBubbleDelegate* delegate,
 }
 
 void BookmarkBubbleView::Init() {
-  if (!kCloseImage) {
+  static SkColor kTitleColor;
+  static bool initialized = false;
+  if (!initialized) {
+    kTitleColor = color_utils::GetReadableColor(SkColorSetRGB(6, 45, 117),
+                                                InfoBubble::kBackgroundColor);
     kCloseImage = ResourceBundle::GetSharedInstance().GetBitmapNamed(
       IDR_INFO_BUBBLE_CLOSE);
+
+    initialized = true;
   }
 
   remove_link_ = new Link(l10n_util::GetString(