Factor more colors into NativeTheme.

ui/views/controls/button/text_button.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 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 "ui/views/controls/button/text_button.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "grit/ui_resources.h"
 #include "ui/base/animation/throb_animation.h"
@@ skipping 31 matching lines @@
 static const int kPreferredNativeThemePaddingVertical = 5;
 
 // By default the focus rect is drawn at the border of the view.
 // For a button, we inset the focus rect by 3 pixels so that it
 // doesn't draw on top of the button's border. This roughly matches
 // how the Windows native focus rect for buttons looks. A subclass
 // that draws a button with different padding may need to
 // override OnPaintFocusBorder and do something different.
 static const int kFocusRectInset = 3;
 
-// Default background color for buttons.
-const SkColor kBackgroundColor = SkColorSetRGB(0xde, 0xde, 0xde);
-
-#if defined(USE_AURA)
-// static
-const SkColor TextButtonBase::kEnabledColor = SkColorSetRGB(0x44, 0x44, 0x44);
-// static
-const SkColor TextButtonBase::kHighlightColor = SkColorSetRGB(0, 0, 0);
-// static
-const SkColor TextButtonBase::kDisabledColor = SkColorSetRGB(0x99, 0x99, 0x99);
-// static
-const SkColor TextButtonBase::kHoverColor = TextButton::kEnabledColor;
-#else  // !defined(USE_AURA)
-// static
-const SkColor TextButtonBase::kEnabledColor = SkColorSetRGB(6, 45, 117);
-// static
-const SkColor TextButtonBase::kHighlightColor =
-    SkColorSetARGB(200, 255, 255, 255);
-// static
-const SkColor TextButtonBase::kDisabledColor = SkColorSetRGB(161, 161, 146);
-// static
-const SkColor TextButtonBase::kHoverColor = TextButton::kEnabledColor;
-#endif  // defined(USE_AURA)
-
 // How long the hover fade animation should last.
 static const int kHoverAnimationDurationMs = 170;
 
 // static
 const char TextButtonBase::kViewClassName[] = "views/TextButtonBase";
 // static
 const char TextButton::kViewClassName[] = "views/TextButton";
 // static
 const char NativeTextButton::kViewClassName[] = "views/NativeTextButton";
 
@@ skipping 182 matching lines @@
 
 
 ////////////////////////////////////////////////////////////////////////////////
 // TextButtonBase, public:
 
 TextButtonBase::TextButtonBase(ButtonListener* listener, const string16& text)
     : CustomButton(listener),
       alignment_(ALIGN_LEFT),
       font_(ResourceBundle::GetSharedInstance().GetFont(
           ResourceBundle::BaseFont)),
-      color_(kEnabledColor),
-      color_enabled_(kEnabledColor),
-      color_disabled_(kDisabledColor),
-      color_highlight_(kHighlightColor),
-      color_hover_(kHoverColor),
+      color_(gfx::NativeTheme::instance()->GetSystemColor(
+          gfx::NativeTheme::kColorId_TextButtonEnabledColor)),
+      color_enabled_(gfx::NativeTheme::instance()->GetSystemColor(
+          gfx::NativeTheme::kColorId_TextButtonEnabledColor)),
+      color_disabled_(gfx::NativeTheme::instance()->GetSystemColor(
+          gfx::NativeTheme::kColorId_TextButtonDisabledColor)),
+      color_highlight_(gfx::NativeTheme::instance()->GetSystemColor(
+          gfx::NativeTheme::kColorId_TextButtonHighlightColor)),
+      color_hover_(gfx::NativeTheme::instance()->GetSystemColor(
+          gfx::NativeTheme::kColorId_TextButtonHoverColor)),
       text_halo_color_(0),
       has_text_halo_(false),
       active_text_shadow_color_(0),
       inactive_text_shadow_color_(0),
       has_shadow_(false),
       shadow_offset_(gfx::Point(1, 1)),
       max_width_(0),
       show_multiple_icon_states_(true),
       is_default_(false),
       multi_line_(false),
@@ skipping 168 matching lines @@
   return flags;
 }
 
 void TextButtonBase::GetExtraParams(
     gfx::NativeTheme::ExtraParams* params) const {
   params->button.checked = false;
   params->button.indeterminate = false;
   params->button.is_default = false;
   params->button.has_border = false;
   params->button.classic_state = 0;
-  params->button.background_color = kBackgroundColor;
+  params->button.background_color =
+      gfx::NativeTheme::instance()->GetSystemColor(
+          gfx::NativeTheme::kColorId_TextButtonBackgroundColor);
 }
 
 gfx::Rect TextButtonBase::GetContentBounds(int extra_width) const {
   gfx::Insets insets = GetInsets();
   int available_width = width() - insets.width();
   int content_width = text_size_.width() + extra_width;
   int content_x = 0;
   switch(alignment_) {
     case ALIGN_LEFT:
       content_x = insets.left();
@@ skipping 368 matching lines @@
 #endif
 }
 
 void NativeTextButton::GetExtraParams(
     gfx::NativeTheme::ExtraParams* params) const {
   TextButton::GetExtraParams(params);
   params->button.has_border = true;
 }
 
 }  // namespace views