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

Side by Side Diff: ui/base/resource/resource_bundle_mac.mm

Issue 10694170: Renamed .pak and .rc files (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Whitespace error (Attempt 2) Created 8 years, 4 months 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 | « ui/base/resource/resource_bundle_gtk.cc ('k') | ui/base/resource/resource_bundle_win.cc » ('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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "ui/base/resource/resource_bundle.h" 5 #include "ui/base/resource/resource_bundle.h"
6 6
7 #import <AppKit/AppKit.h> 7 #import <AppKit/AppKit.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"
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after
44 } 44 }
45 45
46 return FilePath([resource_path fileSystemRepresentation]); 46 return FilePath([resource_path fileSystemRepresentation]);
47 } 47 }
48 48
49 } // namespace 49 } // namespace
50 50
51 void ResourceBundle::LoadCommonResources() { 51 void ResourceBundle::LoadCommonResources() {
52 AddDataPackFromPath(GetResourcesPakFilePath(@"chrome", nil), 52 AddDataPackFromPath(GetResourcesPakFilePath(@"chrome", nil),
53 SCALE_FACTOR_100P); 53 SCALE_FACTOR_100P);
54 AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_standard", nil), 54 AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_100_percent",
55 SCALE_FACTOR_100P); 55 nil), SCALE_FACTOR_100P);
56 AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_standard", nil), 56 AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_100_percent",
57 SCALE_FACTOR_100P); 57 nil), SCALE_FACTOR_100P);
58 58
59 // On Windows and ChromeOS we load either the 1x resource or the 2x resource. 59 // On Windows and ChromeOS we load either the 1x resource or the 2x resource.
60 // On Mac we load both and let the UI framework decide which one to use. 60 // On Mac we load both and let the UI framework decide which one to use.
61 #if defined(ENABLE_HIDPI) 61 #if defined(ENABLE_HIDPI)
62 if (base::mac::IsOSLionOrLater()) { 62 if (base::mac::IsOSLionOrLater()) {
63 AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_2x", nil), 63 AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_200_percent",
64 SCALE_FACTOR_200P); 64 nil), SCALE_FACTOR_200P);
65 AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_2x", nil), 65 AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_200_percent",
66 SCALE_FACTOR_200P); 66 nil), SCALE_FACTOR_200P);
67 } 67 }
68 #endif 68 #endif
69 } 69 }
70 70
71 FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale, 71 FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale,
72 bool test_file_exists) { 72 bool test_file_exists) {
73 NSString* mac_locale = base::SysUTF8ToNSString(app_locale); 73 NSString* mac_locale = base::SysUTF8ToNSString(app_locale);
74 74
75 // Mac OS X uses "_" instead of "-", so swap to get a Mac-style value. 75 // Mac OS X uses "_" instead of "-", so swap to get a Mac-style value.
76 mac_locale = [mac_locale stringByReplacingOccurrencesOfString:@"-" 76 mac_locale = [mac_locale stringByReplacingOccurrencesOfString:@"-"
(...skipping 75 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 152
153 // Another thread raced the load and has already cached the image. 153 // Another thread raced the load and has already cached the image.
154 if (images_.count(resource_id)) 154 if (images_.count(resource_id))
155 return images_[resource_id]; 155 return images_[resource_id];
156 156
157 images_[resource_id] = image; 157 images_[resource_id] = image;
158 return images_[resource_id]; 158 return images_[resource_id];
159 } 159 }
160 160
161 } // namespace ui 161 } // namespace ui
OLDNEW
« no previous file with comments | « ui/base/resource/resource_bundle_gtk.cc ('k') | ui/base/resource/resource_bundle_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698