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

Unified Diff: ui/base/resource/resource_bundle_win.cc

Issue 10686005: Add methods to add DataPack from open files (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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
« no previous file with comments | « ui/base/resource/resource_bundle_unittest.cc ('k') | ui/test/test_suite.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_win.cc
diff --git a/ui/base/resource/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc
index 4e525e7bf5d4fc3b536d17063a753f9cb274c395..7ef486a979e123b99a4b847273a705d106e28d87 100644
--- a/ui/base/resource/resource_bundle_win.cc
+++ b/ui/base/resource/resource_bundle_win.cc
@@ -48,22 +48,26 @@ void ResourceBundle::LoadCommonResources() {
switch (ui::GetDisplayLayout()) {
case ui::LAYOUT_TOUCH:
- AddDataPack(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
- SCALE_FACTOR_100P);
- AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
- SCALE_FACTOR_100P);
+ AddDataPackFromPath(
+ GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
+ SCALE_FACTOR_100P);
+ AddDataPackFromPath(
+ GetResourcesPakFilePath("ui_resources_standard.pak"),
+ SCALE_FACTOR_100P);
break;
default:
if (use_hidpi) {
- AddDataPack(GetResourcesPakFilePath("theme_resources_2x.pak"),
- SCALE_FACTOR_200P);
- AddDataPack(GetResourcesPakFilePath("ui_resources_2x.pak"),
- SCALE_FACTOR_200P);
+ AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_2x.pak"),
+ SCALE_FACTOR_200P);
+ AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_2x.pak"),
+ SCALE_FACTOR_200P);
} else {
- AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),
- SCALE_FACTOR_100P);
- AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
- SCALE_FACTOR_100P);
+ AddDataPackFromPath(
+ GetResourcesPakFilePath("theme_resources_standard.pak"),
+ SCALE_FACTOR_100P);
+ AddDataPackFromPath(
+ GetResourcesPakFilePath("ui_resources_standard.pak"),
+ SCALE_FACTOR_100P);
}
break;
}
« no previous file with comments | « ui/base/resource/resource_bundle_unittest.cc ('k') | ui/test/test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698