diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-01 12:32:29 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-01 12:32:29 +0000 |
| commit | 4dd80d8a83072254aa043cc7d986f6cce3130dc5 (patch) | |
| tree | 5174200eeac6f9b3b04ab4affb31f44153704462 /views/controls | |
| parent | ea736776ace22c64a1cabfe5dd609c33ed421a81 (diff) | |
| download | chromium_src-4dd80d8a83072254aa043cc7d986f6cce3130dc5.zip chromium_src-4dd80d8a83072254aa043cc7d986f6cce3130dc5.tar.gz chromium_src-4dd80d8a83072254aa043cc7d986f6cce3130dc5.tar.bz2 | |
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
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87463 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls')
| -rw-r--r-- | views/controls/button/text_button.cc | 4 |
1 files changed, 1 insertions, 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 - - |