diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 16:25:56 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-14 16:25:56 +0000 |
| commit | fca8dc0de7785069b2bb721aca6966fd11f45a0a (patch) | |
| tree | c3f01985bec47ab376b00710abf20184f1110f22 /ash/system/logout_button | |
| parent | e212a306bfbdaac64b4e1a5134dd42b7a0d773af (diff) | |
| download | chromium_src-fca8dc0de7785069b2bb721aca6966fd11f45a0a.zip chromium_src-fca8dc0de7785069b2bb721aca6966fd11f45a0a.tar.gz chromium_src-fca8dc0de7785069b2bb721aca6966fd11f45a0a.tar.bz2 | |
views: Improve the constant names of the ButtonState enum.
We rename then to STATE_FOO, so it is less confusing:
Rather than:
if (state == views::CustomButton::BS_HOT) { ... }
We now have:
if (state == views::CustomButton::STATE_HOVERED) { ... }
A bit more verbose, but much better to read.
R=sky@chromium.org
TBR=jochen@chromium.org # for content/shell
Review URL: https://chromiumcodereview.appspot.com/11275272
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167684 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash/system/logout_button')
| -rw-r--r-- | ash/system/logout_button/tray_logout_button.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ash/system/logout_button/tray_logout_button.cc b/ash/system/logout_button/tray_logout_button.cc index 3acc60a..5b85bbd 100644 --- a/ash/system/logout_button/tray_logout_button.cc +++ b/ash/system/logout_button/tray_logout_button.cc @@ -68,17 +68,17 @@ class LogoutButton : public views::LabelButton, LogoutButton(user::LoginStatus status) : views::LabelButton(this, string16()), login_status_(user::LOGGED_IN_NONE), show_logout_button_in_tray_(false) { - for (size_t state = 0; state < views::CustomButton::BS_COUNT; ++state) { + for (size_t state = 0; state < views::CustomButton::STATE_COUNT; ++state) { SetTextColor(static_cast<views::CustomButton::ButtonState>(state), SK_ColorWHITE); } SetFont(GetFont().DeriveFont(1)); views::LabelButtonBorder* border = new views::LabelButtonBorder(); - border->SetImages(views::CustomButton::BS_NORMAL, + border->SetImages(views::CustomButton::STATE_NORMAL, views::BorderImages(kLogoutButtonBorderNormalImages)); - border->SetImages(views::CustomButton::BS_HOT, + border->SetImages(views::CustomButton::STATE_HOVERED, views::BorderImages(kLogoutButtonBorderHotImages)); - border->SetImages(views::CustomButton::BS_PUSHED, + border->SetImages(views::CustomButton::STATE_PRESSED, views::BorderImages(kLogoutButtonBorderPushedImages)); set_border(border); OnLoginStatusChanged(status); |