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

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

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 side-by-side diff with in-line comments
Download patch
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 e181e7d9c492fb262611ae2a8fd058c5e4a03b0f..4e525e7bf5d4fc3b536d17063a753f9cb274c395 100644
--- a/ui/base/resource/resource_bundle_win.cc
+++ b/ui/base/resource/resource_bundle_win.cc
@@ -49,21 +49,21 @@ void ResourceBundle::LoadCommonResources() {
switch (ui::GetDisplayLayout()) {
case ui::LAYOUT_TOUCH:
AddDataPack(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
- ResourceHandle::kScaleFactor100x);
+ SCALE_FACTOR_100P);
AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
- ResourceHandle::kScaleFactor100x);
+ SCALE_FACTOR_100P);
break;
default:
if (use_hidpi) {
AddDataPack(GetResourcesPakFilePath("theme_resources_2x.pak"),
- ResourceHandle::kScaleFactor200x);
+ SCALE_FACTOR_200P);
AddDataPack(GetResourcesPakFilePath("ui_resources_2x.pak"),
- ResourceHandle::kScaleFactor200x);
+ SCALE_FACTOR_200P);
} else {
AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),
- ResourceHandle::kScaleFactor100x);
+ SCALE_FACTOR_100P);
AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
- ResourceHandle::kScaleFactor100x);
+ SCALE_FACTOR_100P);
}
break;
}

Powered by Google App Engine
This is Rietveld 408576698