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/wm | |
| 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/wm')
| -rw-r--r-- | ash/wm/custom_frame_view_ash.cc | 2 | ||||
| -rw-r--r-- | ash/wm/dialog_frame_view.cc | 6 | ||||
| -rw-r--r-- | ash/wm/frame_painter.cc | 6 | ||||
| -rw-r--r-- | ash/wm/maximize_bubble_controller.cc | 8 | ||||
| -rw-r--r-- | ash/wm/workspace/frame_maximize_button.cc | 4 |
5 files changed, 14 insertions, 12 deletions
diff --git a/ash/wm/custom_frame_view_ash.cc b/ash/wm/custom_frame_view_ash.cc index a7f7517..48a4ff7 100644 --- a/ash/wm/custom_frame_view_ash.cc +++ b/ash/wm/custom_frame_view_ash.cc @@ -97,7 +97,7 @@ void CustomFrameViewAsh::GetWindowMask(const gfx::Size& size, } void CustomFrameViewAsh::ResetWindowControls() { - maximize_button_->SetState(views::CustomButton::BS_NORMAL); + maximize_button_->SetState(views::CustomButton::STATE_NORMAL); } void CustomFrameViewAsh::UpdateWindowIcon() { diff --git a/ash/wm/dialog_frame_view.cc b/ash/wm/dialog_frame_view.cc index f09ce4a..84d3812 100644 --- a/ash/wm/dialog_frame_view.cc +++ b/ash/wm/dialog_frame_view.cc @@ -71,11 +71,11 @@ DialogFrameView::DialogFrameView() { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); close_button_ = new views::ImageButton(this); - close_button_->SetImage(views::CustomButton::BS_NORMAL, + close_button_->SetImage(views::CustomButton::STATE_NORMAL, rb.GetImageNamed(IDR_CLOSE_BAR).ToImageSkia()); - close_button_->SetImage(views::CustomButton::BS_HOT, + close_button_->SetImage(views::CustomButton::STATE_HOVERED, rb.GetImageNamed(IDR_CLOSE_BAR_H).ToImageSkia()); - close_button_->SetImage(views::CustomButton::BS_PUSHED, + close_button_->SetImage(views::CustomButton::STATE_PRESSED, rb.GetImageNamed(IDR_CLOSE_BAR_P).ToImageSkia()); close_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER, views::ImageButton::ALIGN_MIDDLE); diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc index 1ccd992..a4b4c70 100644 --- a/ash/wm/frame_painter.cc +++ b/ash/wm/frame_painter.cc @@ -694,11 +694,11 @@ void FramePainter::SetButtonImages(views::ImageButton* button, int hot_image_id, int pushed_image_id) { ui::ThemeProvider* theme_provider = frame_->GetThemeProvider(); - button->SetImage(views::CustomButton::BS_NORMAL, + button->SetImage(views::CustomButton::STATE_NORMAL, theme_provider->GetImageSkiaNamed(normal_image_id)); - button->SetImage(views::CustomButton::BS_HOT, + button->SetImage(views::CustomButton::STATE_HOVERED, theme_provider->GetImageSkiaNamed(hot_image_id)); - button->SetImage(views::CustomButton::BS_PUSHED, + button->SetImage(views::CustomButton::STATE_PRESSED, theme_provider->GetImageSkiaNamed(pushed_image_id)); } diff --git a/ash/wm/maximize_bubble_controller.cc b/ash/wm/maximize_bubble_controller.cc index 9500560..5734394 100644 --- a/ash/wm/maximize_bubble_controller.cc +++ b/ash/wm/maximize_bubble_controller.cc @@ -820,9 +820,11 @@ BubbleDialogButton::BubbleDialogButton( : views::ImageButton(button_row), button_row_(button_row) { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); - SetImage(views::CustomButton::BS_NORMAL, rb.GetImageSkiaNamed(normal_image)); - SetImage(views::CustomButton::BS_HOT, rb.GetImageSkiaNamed(hovered_image)); - SetImage(views::CustomButton::BS_PUSHED, + SetImage(views::CustomButton::STATE_NORMAL, + rb.GetImageSkiaNamed(normal_image)); + SetImage(views::CustomButton::STATE_HOVERED, + rb.GetImageSkiaNamed(hovered_image)); + SetImage(views::CustomButton::STATE_PRESSED, rb.GetImageSkiaNamed(pressed_image)); button_row->AddChildView(this); } diff --git a/ash/wm/workspace/frame_maximize_button.cc b/ash/wm/workspace/frame_maximize_button.cc index e920a89..455bd80 100644 --- a/ash/wm/workspace/frame_maximize_button.cc +++ b/ash/wm/workspace/frame_maximize_button.cc @@ -356,9 +356,9 @@ bool FrameMaximizeButton::ProcessEndEvent(const ui::LocatedEvent& event) { if (!should_snap || snap_type_ == SNAP_NONE) return false; - SetState(BS_NORMAL); + SetState(views::CustomButton::STATE_NORMAL); // SetState will not call SchedulePaint() if state was already set to - // BS_NORMAL during a drag. + // STATE_NORMAL during a drag. SchedulePaint(); phantom_window_.reset(); // Since Snap might destroy |this|, but the snap_sizer needs to be destroyed, |