diff options
| -rw-r--r-- | chrome/app/theme/balloon_wrench.pdf | bin | 9067 -> 0 bytes | |||
| -rw-r--r-- | chrome/browser/ui/cocoa/notifications/balloon_controller.mm | 15 | ||||
| -rw-r--r-- | chrome/chrome_dll_bundle.gypi | 1 |
3 files changed, 9 insertions, 7 deletions
diff --git a/chrome/app/theme/balloon_wrench.pdf b/chrome/app/theme/balloon_wrench.pdf Binary files differdeleted file mode 100644 index 7a3bbf3..0000000 --- a/chrome/app/theme/balloon_wrench.pdf +++ /dev/null diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm index e0af6ca..b377b3d 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm @@ -61,12 +61,15 @@ const int kRightMargin = 2; DCHECK([self window]); DCHECK_EQ(self, [[self window] delegate]); - NSImage* image = gfx::GetCachedImageWithName(@"balloon_wrench.pdf"); - [optionsButton_ setDefaultImage:image]; - [optionsButton_ setDefaultOpacity:0.6]; - [optionsButton_ setHoverImage:image]; - [optionsButton_ setHoverOpacity:0.9]; - [optionsButton_ setPressedImage:image]; + ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); + [optionsButton_ setDefaultImage: + rb.GetNativeImageNamed(IDR_BALLOON_WRENCH).ToNSImage()]; + [optionsButton_ setDefaultOpacity:1.0]; + [optionsButton_ setHoverImage: + rb.GetNativeImageNamed(IDR_BALLOON_WRENCH_H).ToNSImage()]; + [optionsButton_ setHoverOpacity:1.0]; + [optionsButton_ setPressedImage: + rb.GetNativeImageNamed(IDR_BALLOON_WRENCH_P).ToNSImage()]; [optionsButton_ setPressedOpacity:1.0]; [[optionsButton_ cell] setHighlightsBy:NSNoCellMask]; diff --git a/chrome/chrome_dll_bundle.gypi b/chrome/chrome_dll_bundle.gypi index bc7d4d9..18b3d76 100644 --- a/chrome/chrome_dll_bundle.gypi +++ b/chrome/chrome_dll_bundle.gypi @@ -56,7 +56,6 @@ 'app/framework-Info.plist', '<@(mac_all_xibs)', - 'app/theme/balloon_wrench.pdf', 'app/theme/chevron.pdf', 'app/theme/find_next_Template.pdf', 'app/theme/find_prev_Template.pdf', |