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

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

Issue 10806018: Revert 147288 - Renamed resource files to be more verbose, specifically: (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
« no previous file with comments | « ui/base/resource/resource_bundle_gtk.cc ('k') | ui/base/strings/ui_strings.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/base/resource/resource_bundle_win.cc
===================================================================
--- ui/base/resource/resource_bundle_win.cc (revision 147292)
+++ ui/base/resource/resource_bundle_win.cc (working copy)
@@ -49,26 +49,24 @@
switch (ui::GetDisplayLayout()) {
case ui::LAYOUT_TOUCH:
AddDataPackFromPath(
- GetResourcesPakFilePath("theme_resources_touch_100_percent.pak"),
+ GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
SCALE_FACTOR_100P);
AddDataPackFromPath(
- GetResourcesPakFilePath("ui_resources_100_percent.pak"),
+ GetResourcesPakFilePath("ui_resources_standard.pak"),
SCALE_FACTOR_100P);
break;
default:
if (use_hidpi) {
- AddDataPackFromPath(GetResourcesPakFilePath(
- "theme_resources_200_percent.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_2x.pak"),
SCALE_FACTOR_200P);
- AddDataPackFromPath(GetResourcesPakFilePath(
- "ui_resources_200_percent.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_2x.pak"),
SCALE_FACTOR_200P);
} else {
AddDataPackFromPath(
- GetResourcesPakFilePath("theme_resources_100_percent.pak"),
+ GetResourcesPakFilePath("theme_resources_standard.pak"),
SCALE_FACTOR_100P);
AddDataPackFromPath(
- GetResourcesPakFilePath("ui_resources_100_percent.pak"),
+ GetResourcesPakFilePath("ui_resources_standard.pak"),
SCALE_FACTOR_100P);
}
break;
« no previous file with comments | « ui/base/resource/resource_bundle_gtk.cc ('k') | ui/base/strings/ui_strings.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698