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

chrome/browser/ui/views/download/download_shelf_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/download/download_shelf_view.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 162 matching lines @@
   delete view;
   if (download_views_.empty())
     Close();
   else if (CanAutoClose())
     mouse_watcher_.Start();
   Layout();
   SchedulePaint();
 }
 
 views::View* DownloadShelfView::GetDefaultFocusableChild() {
-  if (!download_views_.empty())
-    return download_views_[0];
-  else
-    return show_all_view_;
+  return download_views_.empty() ?
+      static_cast<View*>(show_all_view_) : download_views_[0];
 }
 
 void DownloadShelfView::OnPaint(gfx::Canvas* canvas) {
   OnPaintBackground(canvas);
   OnPaintBorder(canvas);
 
   // Draw the focus rect here, since it's outside the bounds of the item.
   for (size_t i = 0; i < download_views_.size(); ++i) {
     if (download_views_[i]->HasFocus()) {
       gfx::Rect r = GetFocusRectBounds(download_views_[i]);
@@ skipping 47 matching lines @@
 
 void DownloadShelfView::AnimationEnded(const ui::Animation *animation) {
   if (animation == shelf_animation_.get()) {
     parent_->SetDownloadShelfVisible(shelf_animation_->IsShowing());
     if (!shelf_animation_->IsShowing())
       Closed();
   }
 }
 
 void DownloadShelfView::Layout() {
-  // Now that we know we have a parent, we can safely set our theme colors.
-  show_all_view_->SetColor(
-      GetThemeProvider()->GetColor(ThemeService::COLOR_BOOKMARK_TEXT));
-  set_background(views::Background::CreateSolidBackground(
-      GetThemeProvider()->GetColor(ThemeService::COLOR_TOOLBAR)));
-
   // Let our base class layout our child views
   views::View::Layout();
 
   // If there is not enough room to show the first download item, show the
   // "Show all downloads" link to the left to make it more visible that there is
   // something to see.
   bool show_link_only = !CanFitFirstDownloadItem();
 
   gfx::Size image_size = arrow_image_->GetPreferredSize();
   gfx::Size close_button_size = close_button_->GetPreferredSize();
@@ skipping 50 matching lines @@
     if (next_x < max_download_x) {
       (*ri)->SetVisible(true);
       (*ri)->SetBounds(x, CenterPosition(view_size.height(), height()),
                        item_width, view_size.height());
     } else {
       (*ri)->SetVisible(false);
     }
   }
 }
 
+void DownloadShelfView::ViewHierarchyChanged(bool is_add,
+                                             View* parent,
+                                             View* child) {
+  View::ViewHierarchyChanged(is_add, parent, child);
+
+  if (is_add && (child == this)) {
+    // Now that we know we have a parent, we can safely set our theme colors.
+    set_background(views::Background::CreateSolidBackground(
+        GetThemeProvider()->GetColor(ThemeService::COLOR_TOOLBAR)));
+    show_all_view_->SetBackgroundColor(background()->get_color());
+    show_all_view_->SetEnabledColor(
+        GetThemeProvider()->GetColor(ThemeService::COLOR_BOOKMARK_TEXT));
+  }
+}
+
 bool DownloadShelfView::CanFitFirstDownloadItem() {
   if (download_views_.empty())
     return true;
 
   gfx::Size image_size = arrow_image_->GetPreferredSize();
   gfx::Size close_button_size = close_button_->GetPreferredSize();
   gfx::Size show_all_size = show_all_view_->GetPreferredSize();
 
   // Let's compute the width available for download items, which is the width
   // of the shelf minus the "Show all downloads" link, arrow and close button
@@ skipping 104 matching lines @@
     const DownloadItemView* download_item_view) {
   gfx::Rect bounds = download_item_view->bounds();
 
 #if defined(TOOLKIT_VIEWS)
   bounds.set_height(bounds.height() - 1);
   bounds.Offset(0, 3);
 #endif
 
   return bounds;
 }