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

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

Issue 10151025: Add scale factor tag to data packs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 8 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/base/resource/resource_data_dll_win.h » ('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 78900029d54c02fe320aa2fadfba077600c2a643..c28cf12c680baeb3d1ec391db9b74b2a9f34c503 100644
--- a/ui/base/resource/resource_bundle_win.cc
+++ b/ui/base/resource/resource_bundle_win.cc
@@ -45,16 +45,22 @@ void ResourceBundle::LoadCommonResources() {
switch (ui::GetDisplayLayout()) {
case ui::LAYOUT_TOUCH:
- AddDataPack(GetResourcesPakFilePath("theme_resources_metro_1x.pak"));
- AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"));
+ AddDataPack(GetResourcesPakFilePath("theme_resources_metro_1x.pak"),
+ ResourceHandle::kScaleFactor100x);
+ AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
+ ResourceHandle::kScaleFactor100x);
break;
default:
if (use_hidpi) {
- AddDataPack(GetResourcesPakFilePath("theme_resources_2x.pak"));
- AddDataPack(GetResourcesPakFilePath("ui_resources_2x.pak"));
+ AddDataPack(GetResourcesPakFilePath("theme_resources_2x.pak"),
+ ResourceHandle::kScaleFactor200x);
+ AddDataPack(GetResourcesPakFilePath("ui_resources_2x.pak"),
+ ResourceHandle::kScaleFactor200x);
} else {
- AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"));
- AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"));
+ AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),
+ ResourceHandle::kScaleFactor100x);
+ AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
+ ResourceHandle::kScaleFactor100x);
}
break;
}
« no previous file with comments | « ui/base/resource/resource_bundle_unittest.cc ('k') | ui/base/resource/resource_data_dll_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698