diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-22 20:29:58 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-12-22 20:29:58 +0000 |
| commit | ca2b1cbcace07670d6631bfe226ffc906c009453 (patch) | |
| tree | 8c6aa3f26331f06eb353fcf7a6d32860c42e736a /chrome/browser/ui/cocoa/notifications/balloon_controller.mm | |
| parent | 1ce107fc44a5c1d3d92ad01bead09be8e8b2acad (diff) | |
| download | chromium_src-ca2b1cbcace07670d6631bfe226ffc906c009453.zip chromium_src-ca2b1cbcace07670d6631bfe226ffc906c009453.tar.gz chromium_src-ca2b1cbcace07670d6631bfe226ffc906c009453.tar.bz2 | |
Move nsimage_cache from base to app/mac. Use the app::mac namespace. Update calling code.
Remove unnecessary refs to NullableString from render_thread.*
TEST=it compiles
BUG=none
Review URL: http://codereview.chromium.org/5961007
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69973 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/cocoa/notifications/balloon_controller.mm')
| -rw-r--r-- | chrome/browser/ui/cocoa/notifications/balloon_controller.mm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm index 98bb473..8719387 100644 --- a/chrome/browser/ui/cocoa/notifications/balloon_controller.mm +++ b/chrome/browser/ui/cocoa/notifications/balloon_controller.mm @@ -5,10 +5,10 @@ #include "chrome/browser/ui/cocoa/notifications/balloon_controller.h" #include "app/l10n_util.h" +#include "app/mac/nsimage_cache.h" #include "app/resource_bundle.h" #import "base/cocoa_protocols_mac.h" #include "base/mac_util.h" -#include "base/nsimage_cache_mac.h" #import "base/scoped_nsobject.h" #include "base/utf_string_conversions.h" #include "chrome/browser/notifications/balloon.h" @@ -59,7 +59,7 @@ const int kRightMargin = 2; DCHECK([self window]); DCHECK_EQ(self, [[self window] delegate]); - NSImage* image = nsimage_cache::ImageNamed(@"balloon_wrench.pdf"); + NSImage* image = app::mac::GetCachedImageWithName(@"balloon_wrench.pdf"); [optionsButton_ setDefaultImage:image]; [optionsButton_ setDefaultOpacity:0.6]; [optionsButton_ setHoverImage:image]; |