summaryrefslogtreecommitdiffstats
path: root/ash
diff options
context:
space:
mode:
Diffstat (limited to 'ash')
-rw-r--r--ash/launcher/launcher_button.cc4
-rw-r--r--ash/launcher/launcher_view.cc16
-rw-r--r--ash/monitor/secondary_monitor_view.cc2
-rw-r--r--ash/system/audio/tray_volume.cc6
-rw-r--r--ash/system/bluetooth/tray_bluetooth.cc2
-rw-r--r--ash/system/brightness/tray_brightness.cc2
-rw-r--r--ash/system/drive/tray_drive.cc21
-rw-r--r--ash/system/ime/tray_ime.cc2
-rw-r--r--ash/system/network/tray_sms.cc8
-rw-r--r--ash/system/settings/tray_settings.cc2
-rw-r--r--ash/system/tray/system_tray_delegate.h5
-rw-r--r--ash/system/tray/tray_image_item.cc2
-rw-r--r--ash/system/tray/tray_item_more.cc6
-rw-r--r--ash/system/tray/tray_item_more.h2
-rw-r--r--ash/system/tray/tray_views.cc10
-rw-r--r--ash/system/tray_accessibility.cc4
-rw-r--r--ash/system/tray_caps_lock.cc4
-rw-r--r--ash/system/tray_update.cc2
-rw-r--r--ash/wm/dialog_frame_view.cc6
-rw-r--r--ash/wm/frame_painter.cc6
20 files changed, 57 insertions, 55 deletions
diff --git a/ash/launcher/launcher_button.cc b/ash/launcher/launcher_button.cc
index c6758eb..a5a739e 100644
--- a/ash/launcher/launcher_button.cc
+++ b/ash/launcher/launcher_button.cc
@@ -150,7 +150,7 @@ void LauncherButton::SetShadowedImage(const SkBitmap& bitmap) {
void LauncherButton::SetImage(const SkBitmap& image) {
if (image.empty()) {
// TODO: need an empty image.
- icon_view_->SetImage(&image);
+ icon_view_->SetImage(image);
return;
}
@@ -309,7 +309,7 @@ void LauncherButton::UpdateState() {
else
bar_id = IDR_AURA_LAUNCHER_UNDERLINE_RUNNING;
- bar_->SetImage(rb.GetImageNamed(bar_id).ToSkBitmap());
+ bar_->SetImage(rb.GetImageNamed(bar_id).ToImageSkia());
}
Layout();
diff --git a/ash/launcher/launcher_view.cc b/ash/launcher/launcher_view.cc
index 9ddf698..5df1f0c 100644
--- a/ash/launcher/launcher_view.cc
+++ b/ash/launcher/launcher_view.cc
@@ -284,13 +284,13 @@ void LauncherView::Init() {
overflow_button_->set_accessibility_focusable(true);
overflow_button_->SetImage(
views::CustomButton::BS_NORMAL,
- rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW).ToSkBitmap());
+ rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW).ToImageSkia());
overflow_button_->SetImage(
views::CustomButton::BS_HOT,
- rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW_HOT).ToSkBitmap());
+ rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW_HOT).ToImageSkia());
overflow_button_->SetImage(
views::CustomButton::BS_PUSHED,
- rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW_PUSHED).ToSkBitmap());
+ rb.GetImageNamed(IDR_AURA_LAUNCHER_OVERFLOW_PUSHED).ToImageSkia());
overflow_button_->SetAccessibleName(
l10n_util::GetStringUTF16(IDS_AURA_LAUNCHER_OVERFLOW_NAME));
overflow_button_->set_context_menu_controller(this);
@@ -474,13 +474,15 @@ views::View* LauncherView::CreateViewForItem(const LauncherItem& item) {
views::ImageButton* button = new views::ImageButton(this);
button->SetImage(
views::CustomButton::BS_NORMAL,
- rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST).ToSkBitmap());
+ rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST).ToImageSkia());
button->SetImage(
views::CustomButton::BS_HOT,
- rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_HOT).ToSkBitmap());
+ rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_HOT).
+ ToImageSkia());
button->SetImage(
views::CustomButton::BS_PUSHED,
- rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED).ToSkBitmap());
+ rb.GetImageNamed(IDR_AURA_LAUNCHER_ICON_APPLIST_PUSHED).
+ ToImageSkia());
button->SetAccessibleName(
l10n_util::GetStringUTF16(IDS_AURA_APP_LIST_TITLE));
button->SetTooltipText(
@@ -495,7 +497,7 @@ views::View* LauncherView::CreateViewForItem(const LauncherItem& item) {
int image_id = delegate_ ?
delegate_->GetBrowserShortcutResourceId() :
IDR_AURA_LAUNCHER_BROWSER_SHORTCUT;
- button->SetImage(*rb.GetImageNamed(image_id).ToSkBitmap());
+ button->SetImage(*rb.GetImageNamed(image_id).ToImageSkia());
view = button;
break;
}
diff --git a/ash/monitor/secondary_monitor_view.cc b/ash/monitor/secondary_monitor_view.cc
index 46e9bf8..ad9b250 100644
--- a/ash/monitor/secondary_monitor_view.cc
+++ b/ash/monitor/secondary_monitor_view.cc
@@ -54,7 +54,7 @@ class SecondaryMonitorView : public views::WidgetDelegateView {
AddChildView(shortcut_text_);
shortcut_image_ = new views::ImageView();
- shortcut_image_->SetImage(rb.GetBitmapNamed(IDR_AURA_SWITCH_MONITOR));
+ shortcut_image_->SetImage(rb.GetImageSkiaNamed(IDR_AURA_SWITCH_MONITOR));
AddChildView(shortcut_image_);
}
diff --git a/ash/system/audio/tray_volume.cc b/ash/system/audio/tray_volume.cc
index b43f121..fba2fe8 100644
--- a/ash/system/audio/tray_volume.cc
+++ b/ash/system/audio/tray_volume.cc
@@ -69,9 +69,9 @@ class VolumeButton : public views::ToggleImageButton {
if (image_index != image_index_) {
SkIRect region = SkIRect::MakeXYWH(0, image_index * kVolumeImageHeight,
kVolumeImageWidth, kVolumeImageHeight);
- SkBitmap bitmap;
- image_.ToSkBitmap()->extractSubset(&bitmap, region);
- SetImage(views::CustomButton::BS_NORMAL, &bitmap);
+ gfx::ImageSkia image_skia;
+ image_.ToImageSkia()->extractSubset(&image_skia, region);
+ SetImage(views::CustomButton::BS_NORMAL, &image_skia);
image_index_ = image_index;
}
SchedulePaint();
diff --git a/ash/system/bluetooth/tray_bluetooth.cc b/ash/system/bluetooth/tray_bluetooth.cc
index 4350664..639f79f 100644
--- a/ash/system/bluetooth/tray_bluetooth.cc
+++ b/ash/system/bluetooth/tray_bluetooth.cc
@@ -33,7 +33,7 @@ class BluetoothDefaultView : public TrayItemMore {
explicit BluetoothDefaultView(SystemTrayItem* owner)
: TrayItemMore(owner) {
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
- SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_BLUETOOTH).ToSkBitmap());
+ SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_BLUETOOTH).ToImageSkia());
UpdateLabel();
}
diff --git a/ash/system/brightness/tray_brightness.cc b/ash/system/brightness/tray_brightness.cc
index b52e978..33ced23 100644
--- a/ash/system/brightness/tray_brightness.cc
+++ b/ash/system/brightness/tray_brightness.cc
@@ -52,7 +52,7 @@ class BrightnessView : public views::View,
views::ImageView* icon = new FixedSizedImageView(0, kTrayPopupItemHeight);
gfx::Image image = ui::ResourceBundle::GetSharedInstance().GetImageNamed(
IDR_AURA_UBER_TRAY_BRIGHTNESS);
- icon->SetImage(image.ToSkBitmap());
+ icon->SetImage(image.ToImageSkia());
AddChildView(icon);
slider_ = new views::Slider(this, views::Slider::HORIZONTAL);
diff --git a/ash/system/drive/tray_drive.cc b/ash/system/drive/tray_drive.cc
index 813053d..c963103 100644
--- a/ash/system/drive/tray_drive.cc
+++ b/ash/system/drive/tray_drive.cc
@@ -70,7 +70,7 @@ class DriveDefaultView : public TrayItemMore {
: TrayItemMore(owner) {
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
- SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_DRIVE).ToSkBitmap());
+ SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_DRIVE).ToImageSkia());
Update(list);
}
@@ -96,11 +96,11 @@ class DriveDetailedView : public TrayDetailsView,
in_progress_img_(NULL),
done_img_(NULL),
failed_img_(NULL) {
- in_progress_img_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+ in_progress_img_ = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
IDR_AURA_UBER_TRAY_DRIVE);
- done_img_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+ done_img_ = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
IDR_AURA_UBER_TRAY_DRIVE_DONE);
- failed_img_ = ResourceBundle::GetSharedInstance().GetBitmapNamed(
+ failed_img_ = ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
IDR_AURA_UBER_TRAY_DRIVE_FAILED);
Update(list);
@@ -173,10 +173,10 @@ class DriveDetailedView : public TrayDetailsView,
cancel_button_ = new views::ImageButton(this);
cancel_button_->SetImage(views::ImageButton::BS_NORMAL,
- ResourceBundle::GetSharedInstance().GetBitmapNamed(
+ ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
IDR_AURA_UBER_TRAY_DRIVE_CANCEL));
cancel_button_->SetImage(views::ImageButton::BS_HOT,
- ResourceBundle::GetSharedInstance().GetBitmapNamed(
+ ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
IDR_AURA_UBER_TRAY_DRIVE_CANCEL_HOVER));
UpdateStatus(state, progress);
@@ -266,7 +266,8 @@ class DriveDetailedView : public TrayDetailsView,
CreateSpecialRow(IDS_ASH_STATUS_TRAY_DRIVE, this);
}
- SkBitmap* GetImageForState(ash::DriveOperationStatus::OperationState state) {
+ gfx::ImageSkia* GetImageForState(
+ ash::DriveOperationStatus::OperationState state) {
switch (state) {
case ash::DriveOperationStatus::OPERATION_NOT_STARTED:
case ash::DriveOperationStatus::OPERATION_STARTED:
@@ -362,9 +363,9 @@ class DriveDetailedView : public TrayDetailsView,
// Maps operation entries to their file paths.
std::map<FilePath, RowView*> update_map_;
views::View* settings_;
- SkBitmap* in_progress_img_;
- SkBitmap* done_img_;
- SkBitmap* failed_img_;
+ gfx::ImageSkia* in_progress_img_;
+ gfx::ImageSkia* done_img_;
+ gfx::ImageSkia* failed_img_;
DISALLOW_COPY_AND_ASSIGN(DriveDetailedView);
};
diff --git a/ash/system/ime/tray_ime.cc b/ash/system/ime/tray_ime.cc
index 19f452c..3eff738 100644
--- a/ash/system/ime/tray_ime.cc
+++ b/ash/system/ime/tray_ime.cc
@@ -37,7 +37,7 @@ class IMEDefaultView : public TrayItemMore {
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
SetImage(bundle.GetImageNamed(
- IDR_AURA_UBER_TRAY_IME).ToSkBitmap());
+ IDR_AURA_UBER_TRAY_IME).ToImageSkia());
IMEInfo info;
Shell::GetInstance()->tray_delegate()->GetCurrentIME(&info);
diff --git a/ash/system/network/tray_sms.cc b/ash/system/network/tray_sms.cc
index 99038b1..34cdd25 100644
--- a/ash/system/network/tray_sms.cc
+++ b/ash/system/network/tray_sms.cc
@@ -142,7 +142,7 @@ class TraySms::SmsDefaultView : public TrayItemMore {
explicit SmsDefaultView(TraySms* tray)
: TrayItemMore(tray),
tray_(tray) {
- SetImage(ResourceBundle::GetSharedInstance().GetBitmapNamed(
+ SetImage(ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
IDR_AURA_UBER_TRAY_SMS));
Update();
}
@@ -212,8 +212,8 @@ class TraySms::SmsMessageView : public views::View,
int LayoutDetailedView() {
views::ImageButton* close_button = new views::ImageButton(this);
close_button->SetImage(views::CustomButton::BS_NORMAL,
- ResourceBundle::GetSharedInstance().GetBitmapNamed(
- IDR_AURA_WINDOW_CLOSE));
+ ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+ IDR_AURA_WINDOW_CLOSE));
int msg_width = kTrayPopupWidth - kNotificationCloseButtonWidth -
kTrayPopupPaddingHorizontal * 2;
@@ -251,7 +251,7 @@ class TraySms::SmsMessageView : public views::View,
int LayoutNotificationView() {
icon_ = new views::ImageView;
- icon_->SetImage(ResourceBundle::GetSharedInstance().GetBitmapNamed(
+ icon_->SetImage(ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
IDR_AURA_UBER_TRAY_SMS));
int msg_width = kTrayPopupWidth - kNotificationCloseButtonWidth -
diff --git a/ash/system/settings/tray_settings.cc b/ash/system/settings/tray_settings.cc
index 9089864..8b96ffe 100644
--- a/ash/system/settings/tray_settings.cc
+++ b/ash/system/settings/tray_settings.cc
@@ -34,7 +34,7 @@ class SettingsView : public ash::internal::ActionableView {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
views::ImageView* icon =
new ash::internal::FixedSizedImageView(0, ash::kTrayPopupItemHeight);
- icon->SetImage(rb.GetImageNamed(IDR_AURA_UBER_TRAY_SETTINGS).ToSkBitmap());
+ icon->SetImage(rb.GetImageNamed(IDR_AURA_UBER_TRAY_SETTINGS).ToImageSkia());
AddChildView(icon);
string16 text = rb.GetLocalizedString(
diff --git a/ash/system/tray/system_tray_delegate.h b/ash/system/tray/system_tray_delegate.h
index e4fa9f3..3b9284f 100644
--- a/ash/system/tray/system_tray_delegate.h
+++ b/ash/system/tray/system_tray_delegate.h
@@ -16,8 +16,7 @@
#include "base/i18n/time_formatting.h"
#include "base/string16.h"
#include "third_party/skia/include/core/SkBitmap.h"
-
-class SkBitmap;
+#include "ui/gfx/image/image_skia.h"
namespace ash {
@@ -27,7 +26,7 @@ struct ASH_EXPORT NetworkIconInfo {
bool highlight;
bool tray_icon_visible;
- SkBitmap image;
+ gfx::ImageSkia image;
string16 name;
string16 description;
std::string service_path;
diff --git a/ash/system/tray/tray_image_item.cc b/ash/system/tray/tray_image_item.cc
index a92f2ad..449cbd7 100644
--- a/ash/system/tray/tray_image_item.cc
+++ b/ash/system/tray/tray_image_item.cc
@@ -29,7 +29,7 @@ views::View* TrayImageItem::CreateTrayView(user::LoginStatus status) {
tray_view_ = new TrayItemView;
tray_view_->CreateImageView();
tray_view_->image_view()->SetImage(ui::ResourceBundle::GetSharedInstance().
- GetImageNamed(resource_id_).ToSkBitmap());
+ GetImageNamed(resource_id_).ToImageSkia());
tray_view_->SetVisible(GetInitialVisibility());
return tray_view_;
}
diff --git a/ash/system/tray/tray_item_more.cc b/ash/system/tray/tray_item_more.cc
index 29f1ab4..8e71830 100644
--- a/ash/system/tray/tray_item_more.cc
+++ b/ash/system/tray/tray_item_more.cc
@@ -32,7 +32,7 @@ TrayItemMore::TrayItemMore(SystemTrayItem* owner)
more_ = new views::ImageView;
more_->EnableCanvasFlippingForRTLUI(true);
more_->SetImage(ui::ResourceBundle::GetSharedInstance().GetImageNamed(
- IDR_AURA_UBER_TRAY_MORE).ToSkBitmap());
+ IDR_AURA_UBER_TRAY_MORE).ToImageSkia());
AddChildView(more_);
}
@@ -45,8 +45,8 @@ void TrayItemMore::SetLabel(const string16& label) {
SchedulePaint();
}
-void TrayItemMore::SetImage(const SkBitmap* bitmap) {
- icon_->SetImage(bitmap);
+void TrayItemMore::SetImage(const gfx::ImageSkia* image_skia) {
+ icon_->SetImage(image_skia);
SchedulePaint();
}
diff --git a/ash/system/tray/tray_item_more.h b/ash/system/tray/tray_item_more.h
index 6c4a9f5..8731dde 100644
--- a/ash/system/tray/tray_item_more.h
+++ b/ash/system/tray/tray_item_more.h
@@ -29,7 +29,7 @@ class TrayItemMore : public ActionableView {
virtual ~TrayItemMore();
void SetLabel(const string16& label);
- void SetImage(const SkBitmap* bitmap);
+ void SetImage(const gfx::ImageSkia* image_skia);
void SetAccessibleName(const string16& name);
protected:
diff --git a/ash/system/tray/tray_views.cc b/ash/system/tray/tray_views.cc
index 62c7cda..89a80eb 100644
--- a/ash/system/tray/tray_views.cc
+++ b/ash/system/tray/tray_views.cc
@@ -331,13 +331,13 @@ TrayPopupHeaderButton::TrayPopupHeaderButton(views::ButtonListener* listener,
: views::ToggleImageButton(listener) {
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
SetImage(views::CustomButton::BS_NORMAL,
- bundle.GetImageNamed(enabled_resource_id).ToSkBitmap());
+ bundle.GetImageNamed(enabled_resource_id).ToImageSkia());
SetToggledImage(views::CustomButton::BS_NORMAL,
- bundle.GetImageNamed(disabled_resource_id).ToSkBitmap());
+ bundle.GetImageNamed(disabled_resource_id).ToImageSkia());
SetImage(views::CustomButton::BS_HOT,
- bundle.GetImageNamed(enabled_resource_id_hover).ToSkBitmap());
+ bundle.GetImageNamed(enabled_resource_id_hover).ToImageSkia());
SetToggledImage(views::CustomButton::BS_HOT,
- bundle.GetImageNamed(disabled_resource_id_hover).ToSkBitmap());
+ bundle.GetImageNamed(disabled_resource_id_hover).ToImageSkia());
SetImageAlignment(views::ImageButton::ALIGN_CENTER,
views::ImageButton::ALIGN_MIDDLE);
set_focusable(true);
@@ -471,7 +471,7 @@ void TrayNotificationView::InitView(views::View* contents) {
views::ImageButton* close_button = new views::ImageButton(this);
close_button->SetImage(views::CustomButton::BS_NORMAL,
- ResourceBundle::GetSharedInstance().GetBitmapNamed(
+ ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
IDR_AURA_WINDOW_CLOSE));
int contents_width = kTrayPopupWidth - kNotificationCloseButtonWidth;
diff --git a/ash/system/tray_accessibility.cc b/ash/system/tray_accessibility.cc
index 7d76748..08e173e 100644
--- a/ash/system/tray_accessibility.cc
+++ b/ash/system/tray_accessibility.cc
@@ -32,7 +32,7 @@ class DefaultAccessibilityView : public ActionableView {
FixedSizedImageView* image =
new FixedSizedImageView(0, kTrayPopupItemHeight);
image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_ACCESSIBILITY).
- ToSkBitmap());
+ ToImageSkia());
AddChildView(image);
string16 label = bundle.GetLocalizedString(
@@ -92,7 +92,7 @@ views::View* TrayAccessibility::CreateDetailedView(user::LoginStatus status) {
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
views::ImageView* image = new views::ImageView;
image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_ACCESSIBILITY).
- ToSkBitmap());
+ ToImageSkia());
detailed_->AddChildView(image);
detailed_->AddChildView(new views::Label(
diff --git a/ash/system/tray_caps_lock.cc b/ash/system/tray_caps_lock.cc
index 729fc88..466fa77 100644
--- a/ash/system/tray_caps_lock.cc
+++ b/ash/system/tray_caps_lock.cc
@@ -35,7 +35,7 @@ class CapsLockDefaultView : public ActionableView {
FixedSizedImageView* image =
new FixedSizedImageView(0, kTrayPopupItemHeight);
image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK).
- ToSkBitmap());
+ ToImageSkia());
AddChildView(image);
text_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
@@ -131,7 +131,7 @@ views::View* TrayCapsLock::CreateDetailedView(user::LoginStatus status) {
ui::ResourceBundle& bundle = ui::ResourceBundle::GetSharedInstance();
views::ImageView* image = new views::ImageView;
image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_CAPS_LOCK_DARK).
- ToSkBitmap());
+ ToImageSkia());
detailed_->AddChildView(image);
diff --git a/ash/system/tray_update.cc b/ash/system/tray_update.cc
index d6f03af..55318e1 100644
--- a/ash/system/tray_update.cc
+++ b/ash/system/tray_update.cc
@@ -45,7 +45,7 @@ class UpdateView : public ash::internal::ActionableView {
views::ImageView* image =
new ash::internal::FixedSizedImageView(0, ash::kTrayPopupItemHeight);
image->SetImage(bundle.GetImageNamed(IDR_AURA_UBER_TRAY_UPDATE_DARK).
- ToSkBitmap());
+ ToImageSkia());
AddChildView(image);
AddChildView(new views::Label(
diff --git a/ash/wm/dialog_frame_view.cc b/ash/wm/dialog_frame_view.cc
index f98ab00..31dd6d3 100644
--- a/ash/wm/dialog_frame_view.cc
+++ b/ash/wm/dialog_frame_view.cc
@@ -72,11 +72,11 @@ DialogFrameView::DialogFrameView() {
ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
close_button_ = new views::ImageButton(this);
close_button_->SetImage(views::CustomButton::BS_NORMAL,
- rb.GetImageNamed(IDR_CLOSE_BAR).ToSkBitmap());
+ rb.GetImageNamed(IDR_CLOSE_BAR).ToImageSkia());
close_button_->SetImage(views::CustomButton::BS_HOT,
- rb.GetImageNamed(IDR_CLOSE_BAR_H).ToSkBitmap());
+ rb.GetImageNamed(IDR_CLOSE_BAR_H).ToImageSkia());
close_button_->SetImage(views::CustomButton::BS_PUSHED,
- rb.GetImageNamed(IDR_CLOSE_BAR_P).ToSkBitmap());
+ rb.GetImageNamed(IDR_CLOSE_BAR_P).ToImageSkia());
close_button_->SetImageAlignment(views::ImageButton::ALIGN_CENTER,
views::ImageButton::ALIGN_MIDDLE);
AddChildView(close_button_);
diff --git a/ash/wm/frame_painter.cc b/ash/wm/frame_painter.cc
index 7e84960..f35db43 100644
--- a/ash/wm/frame_painter.cc
+++ b/ash/wm/frame_painter.cc
@@ -569,11 +569,11 @@ void FramePainter::SetButtonImages(views::ImageButton* button,
int pushed_bitmap_id) {
ui::ThemeProvider* theme_provider = frame_->GetThemeProvider();
button->SetImage(views::CustomButton::BS_NORMAL,
- theme_provider->GetBitmapNamed(normal_bitmap_id));
+ theme_provider->GetImageSkiaNamed(normal_bitmap_id));
button->SetImage(views::CustomButton::BS_HOT,
- theme_provider->GetBitmapNamed(hot_bitmap_id));
+ theme_provider->GetImageSkiaNamed(hot_bitmap_id));
button->SetImage(views::CustomButton::BS_PUSHED,
- theme_provider->GetBitmapNamed(pushed_bitmap_id));
+ theme_provider->GetImageSkiaNamed(pushed_bitmap_id));
}
int FramePainter::GetTitleOffsetX() const {
generated by cgit v1.1 at 2025-02-09 14:14:43 +0000