Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(4937)

Unified Diff: chrome/browser/themes/theme_service_mac.mm

Issue 10933083: Remove deprecated gfx::Image::operator NSImage*(). (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Comments and merge Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/themes/theme_service_mac.mm
diff --git a/chrome/browser/themes/theme_service_mac.mm b/chrome/browser/themes/theme_service_mac.mm
index 61f57d089865ba5bfc982cfc55f36c62ff248172..0cbe655f44f23d5b4b8f1f3591e39e9308d1aa36 100644
--- a/chrome/browser/themes/theme_service_mac.mm
+++ b/chrome/browser/themes/theme_service_mac.mm
@@ -51,13 +51,13 @@ NSImage* ThemeService::GetNSImageNamed(int id, bool allow_default) const {
if (theme_pack_.get()) {
const gfx::Image* image = theme_pack_->GetImageNamed(id);
if (image)
- nsimage = *image;
+ nsimage = image->ToNSImage();
}
// If the theme didn't override this image then load it from the resource
// bundle.
if (!nsimage) {
- nsimage = rb_.GetNativeImageNamed(id);
+ nsimage = rb_.GetNativeImageNamed(id).ToNSImage();
}
// We loaded successfully. Cache the image.

Powered by Google App Engine
This is Rietveld 408576698