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

Side by Side Diff: app/mac/nsimage_cache.mm

Issue 5961007: Move nsimage_cache from base to app/mac. Use the app::mac namespace. Update c... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « app/mac/nsimage_cache.h ('k') | app/mac/nsimage_cache_unittest.cc.README » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "base/nsimage_cache_mac.h" 5 #include "app/mac/nsimage_cache.h"
6 6
7 #import <AppKit/AppKit.h> 7 #import <AppKit/AppKit.h>
8 8
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/mac_util.h" 10 #include "base/mac_util.h"
11 11
12 // When C++ exceptions are disabled, the C++ library defines |try| and 12 // When C++ exceptions are disabled, the C++ library defines |try| and
13 // |catch| so as to allow exception-expecting C++ code to build properly when 13 // |catch| so as to allow exception-expecting C++ code to build properly when
14 // language support for exceptions is not present. These macros interfere 14 // language support for exceptions is not present. These macros interfere
15 // with the use of |@try| and |@catch| in Objective-C files such as this one. 15 // with the use of |@try| and |@catch| in Objective-C files such as this one.
16 // Undefine these macros here, after everything has been #included, since 16 // Undefine these macros here, after everything has been #included, since
17 // there will be no C++ uses and only Objective-C uses from this point on. 17 // there will be no C++ uses and only Objective-C uses from this point on.
18 #undef try 18 #undef try
19 #undef catch 19 #undef catch
20 20
21 namespace nsimage_cache { 21 namespace app {
22 namespace mac {
22 23
23 static NSMutableDictionary* image_cache = nil; 24 static NSMutableDictionary* image_cache = nil;
24 25
25 NSImage* ImageNamed(NSString* name) { 26 NSImage* GetCachedImageWithName(NSString* name) {
26 DCHECK(name); 27 DCHECK(name);
27 28
28 // NOTE: to make this thread safe, we'd have to sync on the cache and 29 // NOTE: to make this thread safe, we'd have to sync on the cache and
29 // also force all the bundle calls on the main thread. 30 // also force all the bundle calls on the main thread.
30 31
31 if (!image_cache) { 32 if (!image_cache) {
32 image_cache = [[NSMutableDictionary alloc] init]; 33 image_cache = [[NSMutableDictionary alloc] init];
33 DCHECK(image_cache); 34 DCHECK(image_cache);
34 } 35 }
35 36
(...skipping 22 matching lines...) Expand all
58 result = nil; 59 result = nil;
59 } 60 }
60 } 61 }
61 } 62 }
62 63
63 // TODO: if we ever limit the cache size, this should retain & autorelease 64 // TODO: if we ever limit the cache size, this should retain & autorelease
64 // the image. 65 // the image.
65 return result; 66 return result;
66 } 67 }
67 68
68 void Clear(void) { 69 void ClearCachedImages(void) {
69 // NOTE: to make this thread safe, we'd have to sync on the cache. 70 // NOTE: to make this thread safe, we'd have to sync on the cache.
70 [image_cache removeAllObjects]; 71 [image_cache removeAllObjects];
71 } 72 }
72 73
73 } // namespace nsimage_cache 74 } // namespace mac
75 } // namespace app
OLDNEW
« no previous file with comments | « app/mac/nsimage_cache.h ('k') | app/mac/nsimage_cache_unittest.cc.README » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698