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

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

Issue 10151025: Add scale factor tag to data packs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix build 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
Index: ui/base/resource/resource_bundle_linux.cc
diff --git a/ui/base/resource/resource_bundle_linux.cc b/ui/base/resource/resource_bundle_linux.cc
index 5c8d598d71d6e0a1bf1b5f27d103253966d0a03d..aa81a72366894fa40816e8cdcffa7428fa76e8b2 100644
--- a/ui/base/resource/resource_bundle_linux.cc
+++ b/ui/base/resource/resource_bundle_linux.cc
@@ -21,9 +21,14 @@ FilePath GetResourcesPakFilePath(const std::string& pak_name) {
namespace ui {
void ResourceBundle::LoadCommonResources() {
- AddDataPack(GetResourcesPakFilePath("chrome.pak"));
- AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"));
- AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"));
+ AddDataPack(GetResourcesPakFilePath("chrome.pak"), 1.0);
+ AddDataPack(GetResourcesPakFilePath("theme_resources_standard.pak"), 1.0);
+ AddDataPack(GetResourcesPakFilePath("ui_resources_standard.pak"), 1.0);
+
+#if defined(ENABLE_HIDPI)
+ AddDataPack(GetResourcesPakFilePath("theme_resources_2x.pak"), 2.0);
+ AddDataPack(GetResourcesPakFilePath("ui_resources_2x.pak"), 2.0);
+#endif
}
} // namespace ui

Powered by Google App Engine
This is Rietveld 408576698