From fca8dc0de7785069b2bb721aca6966fd11f45a0a Mon Sep 17 00:00:00 2001 From: "tfarina@chromium.org" Date: Wed, 14 Nov 2012 16:25:56 +0000 Subject: 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 --- ui/views/examples/button_example.cc | 12 ++++++------ ui/views/examples/native_theme_button_example.cc | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) (limited to 'ui/views/examples') diff --git a/ui/views/examples/button_example.cc b/ui/views/examples/button_example.cc index 54f5363..41e03fb 100644 --- a/ui/views/examples/button_example.cc +++ b/ui/views/examples/button_example.cc @@ -47,17 +47,17 @@ void ButtonExample::CreateExampleView(View* container) { label_button_ = new LabelButton(this, ASCIIToUTF16("Label Button")); label_button_->set_focusable(true); - label_button_->SetTextColor(CustomButton::BS_HOT, SK_ColorRED); + label_button_->SetTextColor(CustomButton::STATE_HOVERED, SK_ColorRED); container->AddChildView(label_button_); ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); image_button_ = new ImageButton(this); image_button_->set_focusable(true); - image_button_->SetImage(ImageButton::BS_NORMAL, + image_button_->SetImage(ImageButton::STATE_NORMAL, rb.GetImageNamed(IDR_CLOSE).ToImageSkia()); - image_button_->SetImage(ImageButton::BS_HOT, + image_button_->SetImage(ImageButton::STATE_HOVERED, rb.GetImageNamed(IDR_CLOSE_H).ToImageSkia()); - image_button_->SetImage(ImageButton::BS_PUSHED, + image_button_->SetImage(ImageButton::STATE_PRESSED, rb.GetImageNamed(IDR_CLOSE_P).ToImageSkia()); image_button_->SetOverlayImage(rb.GetImageNamed( IDR_MENU_CHECK).ToImageSkia()); @@ -150,8 +150,8 @@ void ButtonExample::LabelButtonPressed(const ui::Event& event) { string16() : ASCIIToUTF16("Label Button")); } } else if (event.IsAltDown()) { - label_button_->SetImage(CustomButton::BS_NORMAL, - label_button_->GetImage(CustomButton::BS_NORMAL).isNull() ? + label_button_->SetImage(CustomButton::STATE_NORMAL, + label_button_->GetImage(CustomButton::STATE_NORMAL).isNull() ? *icon_ : gfx::ImageSkia()); } else { label_button_->SetHorizontalAlignment( diff --git a/ui/views/examples/native_theme_button_example.cc b/ui/views/examples/native_theme_button_example.cc index 8adbf03..8f12331 100644 --- a/ui/views/examples/native_theme_button_example.cc +++ b/ui/views/examples/native_theme_button_example.cc @@ -130,13 +130,13 @@ ui::NativeTheme::State ExampleNativeThemeButton::GetThemeState( int selected = cb_state_->selected_index(); if (selected > 3) { switch (state()) { - case BS_DISABLED: + case STATE_DISABLED: return ui::NativeTheme::kDisabled; - case BS_NORMAL: + case STATE_NORMAL: return ui::NativeTheme::kNormal; - case BS_HOT: + case STATE_HOVERED: return ui::NativeTheme::kHovered; - case BS_PUSHED: + case STATE_PRESSED: return ui::NativeTheme::kPressed; default: NOTREACHED(); -- cgit v1.1