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/resource_bundle.h" | 5 #include "ui/base/resource/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/basictypes.h" |
10 #include "base/file_path.h" | 10 #include "base/file_path.h" |
11 #include "base/mac/mac_util.h" | 11 #include "base/mac/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 ui { |
| 16 |
15 namespace { | 17 namespace { |
16 | 18 |
17 FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) { | 19 FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) { |
18 NSString *resource_path; | 20 NSString *resource_path; |
19 // Some of the helper processes need to be able to fetch resources | 21 // Some of the helper processes need to be able to fetch resources |
20 // (chrome_main.cc: SubprocessNeedsResourceBundle()). Fetch the same locale | 22 // (chrome_main.cc: SubprocessNeedsResourceBundle()). Fetch the same locale |
21 // as the already-running browser instead of using what NSBundle might pick | 23 // as the already-running browser instead of using what NSBundle might pick |
22 // based on values at helper launch time. | 24 // based on values at helper launch time. |
23 if ([mac_locale length]) { | 25 if ([mac_locale length]) { |
24 resource_path = [base::mac::MainAppBundle() pathForResource:name | 26 resource_path = [base::mac::MainAppBundle() pathForResource:name |
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 NSImage* ResourceBundle::GetNSImageNamed(int resource_id) { | 61 NSImage* ResourceBundle::GetNSImageNamed(int resource_id) { |
60 // Currently this doesn't make a cache holding these as NSImages because | 62 // 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. | 63 // GetBitmapNamed has a cache, and we don't want to double cache. |
62 SkBitmap* bitmap = GetBitmapNamed(resource_id); | 64 SkBitmap* bitmap = GetBitmapNamed(resource_id); |
63 if (!bitmap) | 65 if (!bitmap) |
64 return nil; | 66 return nil; |
65 | 67 |
66 NSImage* nsimage = gfx::SkBitmapToNSImage(*bitmap); | 68 NSImage* nsimage = gfx::SkBitmapToNSImage(*bitmap); |
67 return nsimage; | 69 return nsimage; |
68 } | 70 } |
| 71 |
| 72 } // namespace ui |
OLD | NEW |