diff options
| author | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-13 14:52:20 +0000 |
|---|---|---|
| committer | avi@chromium.org <avi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-10-13 14:52:20 +0000 |
| commit | f82d69e9468b9c6250d093da8667816839d1c503 (patch) | |
| tree | 81c868a0eba4a6d26df42aed2570e4630145cbe4 /chrome | |
| parent | 7d9fb9604607d94b8606eac97b2d64f923923a08 (diff) | |
| download | chromium_src-f82d69e9468b9c6250d093da8667816839d1c503.zip chromium_src-f82d69e9468b9c6250d093da8667816839d1c503.tar.gz chromium_src-f82d69e9468b9c6250d093da8667816839d1c503.tar.bz2 | |
Mac: Make the nsimage_cache behave more like +[NSImage imageNamed:]
BUG=none
TEST=no visible change
Review URL: http://codereview.chromium.org/272032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@28815 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
| -rw-r--r-- | chrome/browser/cocoa/nsimage_cache_unittest.mm | 10 | ||||
| -rw-r--r-- | chrome/browser/cocoa/toolbar_controller.mm | 1 |
2 files changed, 10 insertions, 1 deletions
diff --git a/chrome/browser/cocoa/nsimage_cache_unittest.mm b/chrome/browser/cocoa/nsimage_cache_unittest.mm index 03d1b5e..7fe42f8 100644 --- a/chrome/browser/cocoa/nsimage_cache_unittest.mm +++ b/chrome/browser/cocoa/nsimage_cache_unittest.mm @@ -56,4 +56,14 @@ TEST_F(NSImageCacheTest, LookupFoundAndClear) { << "how'd we get the same image after a cache clear?"; } +TEST_F(NSImageCacheTest, AutoTemplating) { + NSImage *templateImage = nsimage_cache::ImageNamed(@"back_Template.pdf"); + EXPECT_TRUE([templateImage isTemplate] == YES) + << "Image ending in 'Template' should be marked as being a template"; + NSImage *nonTemplateImage = nsimage_cache::ImageNamed(@"aliasCursor.png"); + EXPECT_FALSE([nonTemplateImage isTemplate] == YES) + << "Image not ending in 'Template' should not be marked as being a " + "template"; +} + } // namespace diff --git a/chrome/browser/cocoa/toolbar_controller.mm b/chrome/browser/cocoa/toolbar_controller.mm index e85f3a1..2910728 100644 --- a/chrome/browser/cocoa/toolbar_controller.mm +++ b/chrome/browser/cocoa/toolbar_controller.mm @@ -289,7 +289,6 @@ class PrefObserverBridge : public NotificationObserver { tag = IDC_STOP; } NSImage* stopStartImage = nsimage_cache::ImageNamed(imageName); - [stopStartImage setTemplate:YES]; [goButton_ setImage:stopStartImage]; [goButton_ setTag:tag]; } |