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

chrome/browser/ui/panels/panel_browser_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/panels/panel_browser_view.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_browser_frame_view.h"
@@ skipping 509 matching lines @@
 }
 
 void NativePanelTestingWin::FinishDragTitlebar() {
   panel_browser_view_->OnTitlebarMouseReleased();
 }
 
 bool NativePanelTestingWin::VerifyDrawingAttention() const {
   PanelBrowserFrameView* frame_view = panel_browser_view_->GetFrameView();
   SkColor attention_color = frame_view->GetTitleColor(
       PanelBrowserFrameView::PAINT_FOR_ATTENTION);
-  return attention_color == frame_view->title_label_->GetColor();
+  return attention_color == frame_view->title_label_->enabled_color();
 }
 
 bool NativePanelTestingWin::VerifyActiveState(bool is_active) {
   PanelBrowserFrameView* frame_view = panel_browser_view_->GetFrameView();
 
   PanelBrowserFrameView::PaintState expected_paint_state =
       is_active ? PanelBrowserFrameView::PAINT_AS_ACTIVE
                 : PanelBrowserFrameView::PAINT_AS_INACTIVE;
   if (frame_view->paint_state_ != expected_paint_state)
     return false;
 
   SkColor expected_color = frame_view->GetTitleColor(expected_paint_state);
-  return expected_color == frame_view->title_label_->GetColor();
+  return expected_color == frame_view->title_label_->enabled_color();
 }
 
 bool NativePanelTestingWin::IsWindowSizeKnown() const {
   return true;
 }
 
 bool NativePanelTestingWin::IsAnimatingBounds() const {
   return panel_browser_view_->bounds_animator_.get() &&
          panel_browser_view_->bounds_animator_->is_animating();
 }