Make views::Label and views::Link auto-color themselves to be readable over their background colo...

chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc

 // Copyright (c) 2011 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/ui/views/bookmarks/bookmark_bar_instructions_view.h"
 
 #include <algorithm>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/defaults.h"
@@ skipping 11 matching lines @@
 }  // namespace
 
 BookmarkBarInstructionsView::BookmarkBarInstructionsView(Delegate* delegate)
     : delegate_(delegate),
       instructions_(NULL),
       import_link_(NULL),
       baseline_(-1),
       updated_colors_(false) {
   instructions_ = new views::Label(
       l10n_util::GetStringUTF16(IDS_BOOKMARKS_NO_ITEMS));
+  instructions_->SetAutoColorReadabilityEnabled(false);
   AddChildView(instructions_);
 
   if (browser_defaults::kShowImportOnBookmarkBar) {
     import_link_ = new views::Link(
         l10n_util::GetStringUTF16(IDS_BOOKMARK_BAR_IMPORT_LINK));
     // We don't want the link to alter tab navigation.
     import_link_->set_focusable(false);
     import_link_->set_listener(this);
+    import_link_->SetAutoColorReadabilityEnabled(false);
     AddChildView(import_link_);
   }
 }
 
 gfx::Size BookmarkBarInstructionsView::GetPreferredSize() {
   int ascent = 0, descent = 0, height = 0, width = 0;
   for (int i = 0; i < child_count(); ++i) {
     views::View* view = child_at(i);
     gfx::Size pref = view->GetPreferredSize();
     int baseline = view->GetBaseline();
@@ skipping 52 matching lines @@
 }
 
 void BookmarkBarInstructionsView::UpdateColors() {
   // We don't always have a theme provider (ui tests, for example).
   const ui::ThemeProvider* theme_provider = GetThemeProvider();
   if (!theme_provider)
     return;
   updated_colors_ = true;
   SkColor text_color =
       theme_provider->GetColor(ThemeService::COLOR_BOOKMARK_TEXT);
-  instructions_->SetColor(text_color);
+  instructions_->SetEnabledColor(text_color);
   if (import_link_)
-    import_link_->SetColor(text_color);
+    import_link_->SetEnabledColor(text_color);
 }