Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "app/mac/nsimage_cache.h" | 5 #include "ui/gfx/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/mac_util.h" | 10 #include "base/mac/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 app { | 21 namespace app { |
|
Robert Sesek
2011/06/21 14:08:13
Same here.
tfarina
2011/06/21 18:35:13
Done.
| |
| 22 namespace mac { | 22 namespace mac { |
| 23 | 23 |
| 24 static NSMutableDictionary* image_cache = nil; | 24 static NSMutableDictionary* image_cache = nil; |
| 25 | 25 |
| 26 NSImage* GetCachedImageWithName(NSString* name) { | 26 NSImage* GetCachedImageWithName(NSString* name) { |
| 27 DCHECK(name); | 27 DCHECK(name); |
| 28 | 28 |
| 29 // 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 |
| 30 // also force all the bundle calls on the main thread. | 30 // also force all the bundle calls on the main thread. |
| 31 | 31 |
| (...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 66 return result; | 66 return result; |
| 67 } | 67 } |
| 68 | 68 |
| 69 void ClearCachedImages(void) { | 69 void ClearCachedImages(void) { |
| 70 // 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. |
| 71 [image_cache removeAllObjects]; | 71 [image_cache removeAllObjects]; |
| 72 } | 72 } |
| 73 | 73 |
| 74 } // namespace mac | 74 } // namespace mac |
| 75 } // namespace app | 75 } // namespace app |
| OLD | NEW |