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

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

Issue 10701105: Update webkit_resources to support high-dpi assets (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Change resource_bundle_mac.mm to load webkit_resources* on Mac as for other platforms 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 | « tools/gritsettings/resource_ids ('k') | ui/base/resource/resource_bundle_mac.mm » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 f443e5775706738d9fee8b74cf5e048aef9ec88c..14ffa3c0fcadb9f2e5b52b472adb542a94d0e916 100644
--- a/ui/base/resource/resource_bundle_aurax11.cc
+++ b/ui/base/resource/resource_bundle_aurax11.cc
@@ -52,12 +52,15 @@ void ResourceBundle::LoadCommonResources() {
SCALE_FACTOR_100P);
if (ShouldLoad2xResources()) {
// 2x touch
- AddDataPackFromPath(
- GetResourcesPakFilePath("theme_resources_touch_200_percent.pak"),
- SCALE_FACTOR_200P);
+ AddDataPackFromPath(GetResourcesPakFilePath(
+ "theme_resources_touch_200_percent.pak"),
+ SCALE_FACTOR_200P);
AddDataPackFromPath(GetResourcesPakFilePath(
"ui_resources_touch_200_percent.pak"),
SCALE_FACTOR_200P);
+ AddDataPackFromPath(GetResourcesPakFilePath(
+ "webkit_resources_200_percent.pak"),
+ SCALE_FACTOR_200P);
}
} else {
// 1x non touch
@@ -75,6 +78,9 @@ void ResourceBundle::LoadCommonResources() {
AddDataPackFromPath(GetResourcesPakFilePath(
"ui_resources_200_percent.pak"),
SCALE_FACTOR_200P);
+ AddDataPackFromPath(GetResourcesPakFilePath(
+ "webkit_resources_200_percent.pak"),
+ SCALE_FACTOR_200P);
}
}
}
« no previous file with comments | « tools/gritsettings/resource_ids ('k') | ui/base/resource/resource_bundle_mac.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698