| Index: chrome/browser/cocoa/nsimage_cache.mm | 
| =================================================================== | 
| --- chrome/browser/cocoa/nsimage_cache.mm	(revision 23061) | 
| +++ chrome/browser/cocoa/nsimage_cache.mm	(working copy) | 
| @@ -7,6 +7,15 @@ | 
| #include "base/logging.h" | 
| #include "base/mac_util.h" | 
|  | 
| +// When C++ exceptions are disabled, the C++ library defines |try| and | 
| +// |catch| so as to allow exception-expecting C++ code to build properly when | 
| +// language support for exceptions is not present.  These macros interfere | 
| +// with the use of |@try| and |@catch| in Objective-C files such as this one. | 
| +// Undefine these macros here, after everything has been #included, since | 
| +// there will be no C++ uses and only Objective-C uses from this point on. | 
| +#undef try | 
| +#undef catch | 
| + | 
| namespace nsimage_cache { | 
|  | 
| static NSMutableDictionary *image_cache = nil; | 
| @@ -53,4 +62,4 @@ | 
| [image_cache removeAllObjects]; | 
| } | 
|  | 
| -}  // nsimage_cache | 
| +}  // namespace nsimage_cache | 
|  |