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

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

Issue 10387010: Select theme resources from ResourceBundle at requested scale factor. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge with master. Created 8 years, 7 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
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 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
43 return FilePath(base::SysNSStringToUTF8(name) + ".pak"); 43 return FilePath(base::SysNSStringToUTF8(name) + ".pak");
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 AddDataPack(GetResourcesPakFilePath(@"chrome", nil), 52 AddDataPack(GetResourcesPakFilePath(@"chrome", nil),
53 ResourceHandle::kScaleFactor100x); 53 SCALE_FACTOR_100P);
54 AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard", nil), 54 AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard", nil),
55 ResourceHandle::kScaleFactor100x); 55 SCALE_FACTOR_100P);
56 AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard", nil), 56 AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard", nil),
57 ResourceHandle::kScaleFactor100x); 57 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 AddDataPack(GetResourcesPakFilePath(@"theme_resources_2x", nil), 63 AddDataPack(GetResourcesPakFilePath(@"theme_resources_2x", nil),
64 ResourceHandle::kScaleFactor200x); 64 SCALE_FACTOR_200P);
65 AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard_2x", nil), 65 AddDataPack(GetResourcesPakFilePath(@"theme_resources_standard_2x", nil),
66 ResourceHandle::kScaleFactor200x); 66 SCALE_FACTOR_200P);
67 AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard_2x", nil), 67 AddDataPack(GetResourcesPakFilePath(@"ui_resources_standard_2x", nil),
68 ResourceHandle::kScaleFactor200x); 68 SCALE_FACTOR_200P);
69 } 69 }
70 #endif 70 #endif
71 } 71 }
72 72
73 FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale) { 73 FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale) {
74 NSString* mac_locale = base::SysUTF8ToNSString(app_locale); 74 NSString* mac_locale = base::SysUTF8ToNSString(app_locale);
75 75
76 // Mac OS X uses "_" instead of "-", so swap to get a Mac-style value. 76 // Mac OS X uses "_" instead of "-", so swap to get a Mac-style value.
77 mac_locale = [mac_locale stringByReplacingOccurrencesOfString:@"-" 77 mac_locale = [mac_locale stringByReplacingOccurrencesOfString:@"-"
78 withString:@"_"]; 78 withString:@"_"];
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 153
154 // Another thread raced the load and has already cached the image. 154 // Another thread raced the load and has already cached the image.
155 if (images_.count(resource_id)) 155 if (images_.count(resource_id))
156 return images_[resource_id]; 156 return images_[resource_id];
157 157
158 images_[resource_id] = image; 158 images_[resource_id] = image;
159 return images_[resource_id]; 159 return images_[resource_id];
160 } 160 }
161 161
162 } // namespace ui 162 } // namespace ui
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698