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

Unified Diff: ui/base/resource/resource_bundle_aurax11.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_android.cc ('k') | ui/base/resource/resource_bundle_gtk.cc » ('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
===================================================================
--- ui/base/resource/resource_bundle_aurax11.cc (revision 147292)
+++ ui/base/resource/resource_bundle_aurax11.cc (working copy)
@@ -44,36 +44,29 @@
if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
// 1x touch
- AddDataPackFromPath(GetResourcesPakFilePath(
- "theme_resources_touch_100_percent.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
SCALE_FACTOR_100P);
- AddDataPackFromPath(GetResourcesPakFilePath(
- "ui_resources_touch_100_percent.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_touch.pak"),
SCALE_FACTOR_100P);
if (ShouldLoad2xResources()) {
// 2x touch
AddDataPackFromPath(
- GetResourcesPakFilePath("theme_resources_touch_200_percent.pak"),
+ GetResourcesPakFilePath("theme_resources_touch_2x.pak"),
SCALE_FACTOR_200P);
- AddDataPackFromPath(GetResourcesPakFilePath(
- "ui_resources_touch_200_percent.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_touch_2x.pak"),
SCALE_FACTOR_200P);
}
} else {
// 1x non touch
- AddDataPackFromPath(GetResourcesPakFilePath(
- "theme_resources_100_percent.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_standard.pak"),
SCALE_FACTOR_100P);
- AddDataPackFromPath(GetResourcesPakFilePath(
- "ui_resources_100_percent.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_standard.pak"),
SCALE_FACTOR_100P);
if (ShouldLoad2xResources()) {
// 2x non touch
- 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);
}
}
« no previous file with comments | « ui/base/resource/resource_bundle_android.cc ('k') | ui/base/resource/resource_bundle_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698