Fix label color in TextButtonBase

ui/views/controls/button/text_button.cc

 // 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"
@@ skipping 189 matching lines @@
       has_text_shadow_(false),
       active_text_shadow_color_(0),
       inactive_text_shadow_color_(0),
       text_shadow_offset_(gfx::Point(1, 1)),
       min_width_(0),
       min_height_(0),
       max_width_(0),
       show_multiple_icon_states_(true),
       is_default_(false),
       multi_line_(false),
-      color_(ui::NativeTheme::instance()->GetSystemColor(
-          ui::NativeTheme::kColorId_TextButtonEnabledColor)),
-      color_enabled_(ui::NativeTheme::instance()->GetSystemColor(
-          ui::NativeTheme::kColorId_TextButtonEnabledColor)),
-      color_disabled_(ui::NativeTheme::instance()->GetSystemColor(
-          ui::NativeTheme::kColorId_TextButtonDisabledColor)),
-      color_highlight_(ui::NativeTheme::instance()->GetSystemColor(
-          ui::NativeTheme::kColorId_TextButtonHighlightColor)),
-      color_hover_(ui::NativeTheme::instance()->GetSystemColor(
-          ui::NativeTheme::kColorId_TextButtonHoverColor)),
+      color_(0),

[msw, 2012/12/12 19:38:16]

nit: Skip initializing these values to 0.

[cpu_(ooo_6.6-7.5), 2012/12/12 22:53:25]

Done.

+      color_enabled_(0),
+      color_disabled_(0),
+      color_highlight_(0),
+      color_hover_(0),
       use_enabled_color_from_theme_(true),
       use_disabled_color_from_theme_(true),
       use_highlight_color_from_theme_(true),
       use_hover_color_from_theme_(true) {
   SetText(text);
+  OnNativeThemeChanged(ui::NativeTheme::instance());
   SetAnimationDuration(kHoverAnimationDurationMs);
 }
 
 TextButtonBase::~TextButtonBase() {
 }
 
 void TextButtonBase::SetIsDefault(bool is_default) {
   if (is_default == is_default_)
     return;
   is_default_ = is_default;
@@ skipping 292 matching lines @@
   CustomButton::OnEnabledChanged();
 }
 
 std::string TextButtonBase::GetClassName() const {
   return kViewClassName;
 }
 
 void TextButtonBase::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   if (use_enabled_color_from_theme_) {
     color_enabled_ = theme->GetSystemColor(
-        ui::NativeTheme::kColorId_TextButtonEnabledColor);
+        ui::NativeTheme::kColorId_LabelEnabledColor);

[msw, 2012/12/12 19:38:16]

Repurpose kColorId_TextButtonEnabledColor to get COLOR_BTNTEXT on Win (instead
of this, which yields COLOR_WINDOWTEXT).

[cpu_(ooo_6.6-7.5), 2012/12/12 22:53:25]

Done.

   }
   if (use_disabled_color_from_theme_) {
     color_disabled_ = theme->GetSystemColor(
-        ui::NativeTheme::kColorId_TextButtonDisabledColor);
+        ui::NativeTheme::kColorId_LabelDisabledColor);

[msw, 2012/12/12 19:38:16]

Using kColorId_LabelDisabledColor (COLOR_GRAYTEXT) seems fine, but then I'd make
the same change in LabelButton and trash the old ID.
Otherwise, you could make kColorId_TextButtonDisabledColor use COLOR_GRAYTEXT
(and possibly tweak Aura's corresponding value?).

[cpu_(ooo_6.6-7.5), 2012/12/12 22:53:25]

Done.

   }
   if (use_highlight_color_from_theme_) {
     color_highlight_ = theme->GetSystemColor(

[cpu_(ooo_6.6-7.5), 2012/12/12 03:42:12]

highlight_ is only used on windows and only in PB_FOR_DRAG cases which we don't
seem to be hitting. So I left this alone.

         ui::NativeTheme::kColorId_TextButtonHighlightColor);
   }
   if (use_hover_color_from_theme_) {
     color_hover_ = theme->GetSystemColor(
         ui::NativeTheme::kColorId_TextButtonHoverColor);

[cpu_(ooo_6.6-7.5), 2012/12/12 03:42:12]

this seems correct, on hover the text becomes blue as the button itself. So I
left it alone.

   }
   UpdateColor();
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // TextButtonBase, NativeThemeDelegate overrides:
 
 gfx::Rect TextButtonBase::GetThemePaintRect() const {
   return GetLocalBounds();
 }
@@ skipping 226 matching lines @@
 }
 
 void NativeTextButton::OnNativeThemeChanged(const ui::NativeTheme* theme) {
   SetThemeSpecificState(theme);
 }
 
 void NativeTextButton::SetThemeSpecificState(const ui::NativeTheme* theme) {
 #if defined(OS_WIN)
   if (theme == ui::NativeThemeWin::instance()) {
     if (use_enabled_color_from_theme())
       set_color_enabled(skia::COLORREFToSkColor(GetSysColor(COLOR_BTNTEXT)));

[msw, 2012/12/12 19:38:16]

Use the theme here to get COLOR_BTNTEXT and COLOR_GRAYTEXT indirectly.

     if (use_disabled_color_from_theme())
       set_color_disabled(skia::COLORREFToSkColor(GetSysColor(COLOR_GRAYTEXT)));
     if (use_hover_color_from_theme())
       set_color_hover(skia::COLORREFToSkColor(GetSysColor(COLOR_BTNTEXT)));
     UpdateColor();
     set_focus_border(FocusBorder::CreateDashedFocusBorder(kFocusRectInset,
                                                           kFocusRectInset,
                                                           kFocusRectInset,
                                                           kFocusRectInset));
   } else {
@@ skipping 14 matching lines @@
   // when not using NativeThemeWin.
 #if defined(OS_WIN)
   if (GetNativeTheme() == ui::NativeThemeWin::instance())
     return;
 #endif
   params->button.is_focused = HasFocus() &&
       (focusable() || IsAccessibilityFocusable());
 }
 
 }  // namespace views