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

chrome/browser/ui/views/find_bar_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/find_bar_view.h"
 
 #include <algorithm>
 
 #include "base/string_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 71 matching lines @@
   find_text_ = new SearchTextfieldView();
   find_text_->set_id(VIEW_ID_FIND_IN_PAGE_TEXT_FIELD);
   find_text_->SetFont(rb.GetFont(ResourceBundle::BaseFont));
   find_text_->set_default_width_in_chars(kDefaultCharWidth);
   find_text_->SetController(this);
   find_text_->SetAccessibleName(l10n_util::GetStringUTF16(IDS_ACCNAME_FIND));
   AddChildView(find_text_);
 
   match_count_text_ = new views::Label();
   match_count_text_->SetFont(rb.GetFont(ResourceBundle::BaseFont));
-  match_count_text_->SetColor(kTextColorMatchCount);
   match_count_text_->SetHorizontalAlignment(views::Label::ALIGN_CENTER);
   AddChildView(match_count_text_);
 
   // Create a focus forwarder view which sends focus to find_text_.
   focus_forwarder_view_ = new FocusForwarderView(find_text_);
   AddChildView(focus_forwarder_view_);
 
   find_previous_button_ = new views::ImageButton(this);
   find_previous_button_->set_tag(FIND_PREVIOUS_TAG);
   find_previous_button_->set_focusable(true);
@@ skipping 73 matching lines @@
       result.number_of_matches() != -1 && result.active_match_ordinal() != -1;
 
   // http://crbug.com/34970: some IMEs get confused if we change the text
   // composed by them. To avoid this problem, we should check the IME status and
   // update the text only when the IME is not composing text.
   if (find_text_->text() != find_text && !find_text_->IsIMEComposing()) {
     find_text_->SetText(find_text);
     find_text_->SelectAll();
   }
 
-  if (!find_text.empty() && have_valid_range) {
-    match_count_text_->SetText(
-        l10n_util::GetStringFUTF16(IDS_FIND_IN_PAGE_COUNT,
-            base::IntToString16(result.active_match_ordinal()),
-            base::IntToString16(result.number_of_matches())));
-
-    UpdateMatchCountAppearance(result.number_of_matches() == 0 &&
-                               result.final_update());
-  } else {
+  if (find_text.empty() || !have_valid_range) {
     // If there was no text entered, we don't show anything in the result count
     // area.
-    match_count_text_->SetText(string16());
+    ClearMatchCount();
+    return;
+  }
 
-    UpdateMatchCountAppearance(false);
-  }
+  match_count_text_->SetText(l10n_util::GetStringFUTF16(IDS_FIND_IN_PAGE_COUNT,
+      base::IntToString16(result.active_match_ordinal()),
+      base::IntToString16(result.number_of_matches())));
+
+  UpdateMatchCountAppearance(result.number_of_matches() == 0 &&
+                             result.final_update());
 
   // The match_count label may have increased/decreased in size so we need to
   // do a layout and repaint the dialog so that the find text field doesn't
   // partially overlap the match-count label when it increases on no matches.
   Layout();
   SchedulePaint();
 }
 
 void FindBarView::ClearMatchCount() {
   match_count_text_->SetText(string16());
@@ skipping 236 matching lines @@
     }
   }
 
   return false;
 }
 
 void FindBarView::UpdateMatchCountAppearance(bool no_match) {
   if (no_match) {
     match_count_text_->set_background(
         views::Background::CreateSolidBackground(kBackgroundColorNoMatch));
-    match_count_text_->SetColor(kTextColorNoMatch);
+    match_count_text_->SetEnabledColor(kTextColorNoMatch);
   } else {
     match_count_text_->set_background(
       views::Background::CreateSolidBackground(kBackgroundColorMatch));
-    match_count_text_->SetColor(kTextColorMatchCount);
+    match_count_text_->SetEnabledColor(kTextColorMatchCount);
   }
+  match_count_text_->SetBackgroundColor(
+      match_count_text_->background()->get_color());
 }
 
 bool FindBarView::FocusForwarderView::OnMousePressed(
     const views::MouseEvent& event) {
   if (view_to_focus_on_mousedown_) {
     view_to_focus_on_mousedown_->ClearSelection();
     view_to_focus_on_mousedown_->RequestFocus();
   }
   return true;
 }
@@ skipping 17 matching lines @@
 
 void FindBarView::OnThemeChanged() {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
   if (GetThemeProvider()) {
     close_button_->SetBackground(
         GetThemeProvider()->GetColor(ThemeService::COLOR_TAB_TEXT),
         rb.GetBitmapNamed(IDR_CLOSE_BAR),
         rb.GetBitmapNamed(IDR_CLOSE_BAR_MASK));
   }
 }