diff options
Diffstat (limited to 'ui/views/window/custom_frame_view.cc')
| -rw-r--r-- | ui/views/window/custom_frame_view.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ui/views/window/custom_frame_view.cc b/ui/views/window/custom_frame_view.cc index f4dd9dd..33974a3 100644 --- a/ui/views/window/custom_frame_view.cc +++ b/ui/views/window/custom_frame_view.cc @@ -490,11 +490,11 @@ void CustomFrameView::LayoutWindowControls() { ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); close_button_->SetImage(CustomButton::BS_NORMAL, - rb.GetImageNamed(normal_part).ToImageSkia()); + rb.GetImageNamed(normal_part).ToSkBitmap()); close_button_->SetImage(CustomButton::BS_HOT, - rb.GetImageNamed(hot_part).ToImageSkia()); + rb.GetImageNamed(hot_part).ToSkBitmap()); close_button_->SetImage(CustomButton::BS_PUSHED, - rb.GetImageNamed(pushed_part).ToImageSkia()); + rb.GetImageNamed(pushed_part).ToSkBitmap()); } void CustomFrameView::LayoutTitleBar() { @@ -538,11 +538,11 @@ ImageButton* CustomFrameView::InitWindowCaptionButton( ImageButton* button = new ImageButton(this); button->SetAccessibleName(l10n_util::GetStringUTF16(accessibility_string_id)); button->SetImage(CustomButton::BS_NORMAL, - rb.GetImageNamed(normal_image_id).ToImageSkia()); + rb.GetImageNamed(normal_image_id).ToSkBitmap()); button->SetImage(CustomButton::BS_HOT, - rb.GetImageNamed(hot_image_id).ToImageSkia()); + rb.GetImageNamed(hot_image_id).ToSkBitmap()); button->SetImage(CustomButton::BS_PUSHED, - rb.GetImageNamed(pushed_image_id).ToImageSkia()); + rb.GetImageNamed(pushed_image_id).ToSkBitmap()); AddChildView(button); return button; } |