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

Unified Diff: ui/base/resource/resource_bundle_aurax11.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_aurax11.cc
diff --git a/ui/base/resource/resource_bundle_aurax11.cc b/ui/base/resource/resource_bundle_aurax11.cc
index 6f63dff409c35545ba75709598b3b9c0f0654a70..535f4558070c2e44fc1ddb0ec5515c30062d779b 100644
--- a/ui/base/resource/resource_bundle_aurax11.cc
+++ b/ui/base/resource/resource_bundle_aurax11.cc
@@ -28,18 +28,18 @@ namespace ui {
void ResourceBundle::LoadCommonResources() {
AddDataPack(GetResourcesPakFilePath("chrome.pak"),
- ResourceHandle::kScaleFactor100x);
+ SCALE_FACTOR_100P);
if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
AddDataPack(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
- ResourceHandle::kScaleFactor100x);
+ SCALE_FACTOR_100P);
AddDataPack(GetResourcesPakFilePath("ui_resources_touch.pak"),
- ResourceHandle::kScaleFactor100x);
+ SCALE_FACTOR_100P);
} else {
AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"),
- ResourceHandle::kScaleFactor100x);
+ SCALE_FACTOR_100P);
AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"),
- ResourceHandle::kScaleFactor100x);
+ SCALE_FACTOR_100P);
}
}

Powered by Google App Engine
This is Rietveld 408576698