| OLD | NEW |
| 1 // Copyright (c) 2006-2008 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 "app/resource_bundle.h" | 5 #include "app/resource_bundle.h" |
| 6 | 6 |
| 7 #import <Foundation/Foundation.h> | 7 #import <Foundation/Foundation.h> |
| 8 | 8 |
| 9 #include "base/basictypes.h" |
| 9 #include "base/file_path.h" | 10 #include "base/file_path.h" |
| 10 #include "base/logging.h" | |
| 11 #include "base/mac_util.h" | 11 #include "base/mac_util.h" |
| 12 #include "base/sys_string_conversions.h" | 12 #include "base/sys_string_conversions.h" |
| 13 #include "skia/ext/skia_utils_mac.h" | 13 #include "skia/ext/skia_utils_mac.h" |
| 14 | 14 |
| 15 namespace { | 15 namespace { |
| 16 | 16 |
| 17 FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) { | 17 FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) { |
| 18 NSString *resource_path; | 18 NSString *resource_path; |
| 19 // Some of the helper processes need to be able to fetch resources | 19 // Some of the helper processes need to be able to fetch resources |
| 20 // (chrome_dll_main.cc SubprocessNeedsResourceBundle()). Fetch the same locale | 20 // (chrome_dll_main.cc SubprocessNeedsResourceBundle()). Fetch the same locale |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 NSImage* ResourceBundle::GetNSImageNamed(int resource_id) { | 59 NSImage* ResourceBundle::GetNSImageNamed(int resource_id) { |
| 60 // Currently this doesn't make a cache holding these as NSImages because | 60 // Currently this doesn't make a cache holding these as NSImages because |
| 61 // GetBitmapNamed has a cache, and we don't want to double cache. | 61 // GetBitmapNamed has a cache, and we don't want to double cache. |
| 62 SkBitmap* bitmap = GetBitmapNamed(resource_id); | 62 SkBitmap* bitmap = GetBitmapNamed(resource_id); |
| 63 if (!bitmap) | 63 if (!bitmap) |
| 64 return nil; | 64 return nil; |
| 65 | 65 |
| 66 NSImage* nsimage = gfx::SkBitmapToNSImage(*bitmap); | 66 NSImage* nsimage = gfx::SkBitmapToNSImage(*bitmap); |
| 67 return nsimage; | 67 return nsimage; |
| 68 } | 68 } |
| OLD | NEW |