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

Unified Diff: chrome/browser/ui/panels/panel_titlebar_view_cocoa.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/ui/panels/panel_titlebar_view_cocoa.mm
diff --git a/chrome/browser/ui/panels/panel_titlebar_view_cocoa.mm b/chrome/browser/ui/panels/panel_titlebar_view_cocoa.mm
index f2dc5c30702316aadcdcc07ed11d0ba00afebe9b..9cbf95c91c8ba9a7b55d6a477a82f37b3a2f4a92 100644
--- a/chrome/browser/ui/panels/panel_titlebar_view_cocoa.mm
+++ b/chrome/browser/ui/panels/panel_titlebar_view_cocoa.mm
@@ -309,22 +309,22 @@ static NSEvent* MakeMouseEvent(NSEventType type,
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
[self initializeImageButton:customCloseButton_
- image: rb.GetNativeImageNamed(IDR_PANEL_CLOSE)
- hoverImage:rb.GetNativeImageNamed(IDR_PANEL_CLOSE_H)
- pressedImage:rb.GetNativeImageNamed(IDR_PANEL_CLOSE_C)
+ image:rb.GetNativeImageNamed(IDR_PANEL_CLOSE).ToNSImage()
+ hoverImage:rb.GetNativeImageNamed(IDR_PANEL_CLOSE_H).ToNSImage()
+ pressedImage:rb.GetNativeImageNamed(IDR_PANEL_CLOSE_C).ToNSImage()
toolTip:l10n_util::GetNSStringWithFixup(IDS_PANEL_CLOSE_TOOLTIP)];
// Iniitalize the minimize and restore buttons.
[self initializeImageButton:minimizeButton_
- image:rb.GetNativeImageNamed(IDR_PANEL_MINIMIZE)
- hoverImage:rb.GetNativeImageNamed(IDR_PANEL_MINIMIZE_H)
- pressedImage:rb.GetNativeImageNamed(IDR_PANEL_MINIMIZE_C)
+ image:rb.GetNativeImageNamed(IDR_PANEL_MINIMIZE).ToNSImage()
+ hoverImage:rb.GetNativeImageNamed(IDR_PANEL_MINIMIZE_H).ToNSImage()
+ pressedImage:rb.GetNativeImageNamed(IDR_PANEL_MINIMIZE_C).ToNSImage()
toolTip:l10n_util::GetNSStringWithFixup(IDS_PANEL_MINIMIZE_TOOLTIP)];
[self initializeImageButton:restoreButton_
- image: rb.GetNativeImageNamed(IDR_PANEL_RESTORE)
- hoverImage:rb.GetNativeImageNamed(IDR_PANEL_RESTORE_H)
- pressedImage:rb.GetNativeImageNamed(IDR_PANEL_RESTORE_C)
+ image:rb.GetNativeImageNamed(IDR_PANEL_RESTORE).ToNSImage()
+ hoverImage:rb.GetNativeImageNamed(IDR_PANEL_RESTORE_H).ToNSImage()
+ pressedImage:rb.GetNativeImageNamed(IDR_PANEL_RESTORE_C).ToNSImage()
toolTip:l10n_util::GetNSStringWithFixup(IDS_PANEL_RESTORE_TOOLTIP)];
[controller_ updateTitleBarMinimizeRestoreButtonVisibility];

Powered by Google App Engine
This is Rietveld 408576698