diff options
| author | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-09 01:00:18 +0000 |
|---|---|---|
| committer | zork@chromium.org <zork@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-09 01:00:18 +0000 |
| commit | 8782075ef1d536957152723c0aa806071dc82941 (patch) | |
| tree | a206ce18e31ee5112f7cf34cd6a7375808323f2c | |
| parent | 7e3f27521e3d6b276aee5d09722c9d455a7c14f6 (diff) | |
| download | chromium_src-8782075ef1d536957152723c0aa806071dc82941.zip chromium_src-8782075ef1d536957152723c0aa806071dc82941.tar.gz chromium_src-8782075ef1d536957152723c0aa806071dc82941.tar.bz2 | |
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
| -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 - - |