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

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

Issue 10825111: Repack separate 100 / 200 / touch_100 / touch_200 files into single pak files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: 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
« chrome/chrome_resources.gyp ('K') | « ui/base/resource/resource_bundle_mac.mm ('k') | no next file » | 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 96f5409d41a312e78f3a394b0ea4ff4d2b47c44e..384d2c33d71ac3244c36168361ef7ee104e57c9a 100644
--- a/ui/base/resource/resource_bundle_win.cc
+++ b/ui/base/resource/resource_bundle_win.cc
@@ -49,26 +49,17 @@ void ResourceBundle::LoadCommonResources() {
switch (ui::GetDisplayLayout()) {
case ui::LAYOUT_TOUCH:
AddDataPackFromPath(
- GetResourcesPakFilePath("theme_resources_touch_100_percent.pak"),
- SCALE_FACTOR_100P);
- AddDataPackFromPath(
- GetResourcesPakFilePath("ui_resources_100_percent.pak"),
+ GetResourcesPakFilePath("chrome_touch_100_percent.pak"),
SCALE_FACTOR_100P);
break;
default:
if (use_hidpi) {
AddDataPackFromPath(GetResourcesPakFilePath(
- "theme_resources_200_percent.pak"),
- SCALE_FACTOR_200P);
- AddDataPackFromPath(GetResourcesPakFilePath(
- "ui_resources_200_percent.pak"),
+ "chrome_200_percent.pak"),
SCALE_FACTOR_200P);
} else {
AddDataPackFromPath(
- GetResourcesPakFilePath("theme_resources_100_percent.pak"),
- SCALE_FACTOR_100P);
- AddDataPackFromPath(
- GetResourcesPakFilePath("ui_resources_100_percent.pak"),
+ GetResourcesPakFilePath("chrome_100_percent.pak"),
SCALE_FACTOR_100P);
}
break;
« chrome/chrome_resources.gyp ('K') | « ui/base/resource/resource_bundle_mac.mm ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698