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

Unified Diff: chrome/browser/ui/cocoa/hover_image_button_unittest.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
« no previous file with comments | « chrome/browser/ui/cocoa/history_menu_bridge.mm ('k') | chrome/browser/ui/cocoa/hung_renderer_controller.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/cocoa/hover_image_button_unittest.mm
diff --git a/chrome/browser/ui/cocoa/hover_image_button_unittest.mm b/chrome/browser/ui/cocoa/hover_image_button_unittest.mm
index 2f8ca666e55a458d2a8fb48e12be29a00f9be61f..7702c5c703ca74d87c953a2fe50ada0e6b59198a 100644
--- a/chrome/browser/ui/cocoa/hover_image_button_unittest.mm
+++ b/chrome/browser/ui/cocoa/hover_image_button_unittest.mm
@@ -36,8 +36,8 @@ class HoverImageButtonTest : public CocoaTest {
// Test mouse events.
TEST_F(HoverImageButtonTest, ImageSwap) {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- NSImage* image = rb.GetNativeImageNamed(IDR_HOME);
- NSImage* hover = rb.GetNativeImageNamed(IDR_BACK);
+ NSImage* image = rb.GetNativeImageNamed(IDR_HOME).ToNSImage();
+ NSImage* hover = rb.GetNativeImageNamed(IDR_BACK).ToNSImage();
[button_ setDefaultImage:image];
[button_ setHoverImage:hover];
@@ -53,7 +53,7 @@ TEST_F(HoverImageButtonTest, ImageSwap) {
// Test mouse events.
TEST_F(HoverImageButtonTest, Opacity) {
ResourceBundle& rb = ResourceBundle::GetSharedInstance();
- NSImage* image = rb.GetNativeImageNamed(IDR_HOME);
+ NSImage* image = rb.GetNativeImageNamed(IDR_HOME).ToNSImage();
[button_ setDefaultImage:image];
[button_ setDefaultOpacity:0.5];
[button_ setHoverImage:image];
« no previous file with comments | « chrome/browser/ui/cocoa/history_menu_bridge.mm ('k') | chrome/browser/ui/cocoa/hung_renderer_controller.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698