From 8782075ef1d536957152723c0aa806071dc82941 Mon Sep 17 00:00:00 2001 From: "zork@chromium.org" Date: Thu, 9 Jun 2011 01:00:18 +0000 Subject: Merge 87463 - Use the right version of IsEnabled() when updating the color of a TextButton BUG=chromium-os:15963 TEST=Manual Review URL: http://codereview.chromium.org/7080051 TBR=zork@chromium.org Review URL: http://codereview.chromium.org/7003075 git-svn-id: svn://svn.chromium.org/chrome/branches/782/src@88453 0039d316-1c4b-4281-b951-d872f2087c98 --- views/controls/button/text_button.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/views/controls/button/text_button.cc b/views/controls/button/text_button.cc index e232763..2b24d9e 100644 --- a/views/controls/button/text_button.cc +++ b/views/controls/button/text_button.cc @@ -383,7 +383,7 @@ const ui::Animation* TextButtonBase::GetAnimation() const { } void TextButtonBase::UpdateColor() { - color_ = IsEnabled() ? color_enabled_ : color_disabled_; + color_ = View::IsEnabled() ? color_enabled_ : color_disabled_; } void TextButtonBase::UpdateTextSize() { @@ -738,5 +738,3 @@ gfx::Rect TextButton::GetTextBounds() const { } } // namespace views - - -- cgit v1.1