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

Unified Diff: ui/base/resource/resource_bundle_mac.mm

Issue 419093002: ui: Remove ResourceBundle::LoadCommonResources(). Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: InitParams Created 6 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 side-by-side diff with in-line comments
Download patch
Index: ui/base/resource/resource_bundle_mac.mm
diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm
index 56d16d5ed64fc45cab265597be2b4032e5da1840..b46137a6a2006742af6de45839a4c7fc0736f491 100644
--- a/ui/base/resource/resource_bundle_mac.mm
+++ b/ui/base/resource/resource_bundle_mac.mm
@@ -48,22 +48,6 @@ base::FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
} // namespace
-void ResourceBundle::LoadCommonResources() {
- AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_100_percent",
- nil), SCALE_FACTOR_100P);
- AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_100_percent",
- nil), SCALE_FACTOR_100P);
tony 2014/08/07 16:29:34 Have you verified on OSX we don't need to load web
oshima 2014/08/07 17:01:10 yes, please check if this is needed. If this is ne
tfarina 2014/08/07 17:12:33 The only way I can check is with trybots, as I don
-
- // On Mac we load 1x and 2x resources and we let the UI framework decide
- // which one to use.
- if (IsScaleFactorSupported(SCALE_FACTOR_200P)) {
- AddDataPackFromPath(GetResourcesPakFilePath(@"chrome_200_percent",
- nil), SCALE_FACTOR_200P);
- AddDataPackFromPath(GetResourcesPakFilePath(@"webkit_resources_200_percent",
- nil), SCALE_FACTOR_200P);
- }
-}
-
base::FilePath ResourceBundle::GetLocaleFilePath(const std::string& app_locale,
bool test_file_exists) {
NSString* mac_locale = base::SysUTF8ToNSString(app_locale);

Powered by Google App Engine
This is Rietveld 408576698