summaryrefslogtreecommitdiffstats
path: root/ui/base
diff options
context:
space:
mode:
Diffstat (limited to 'ui/base')
-rw-r--r--ui/base/resource/resource_bundle_android.cc6
-rw-r--r--ui/base/resource/resource_bundle_aurax11.cc23
-rw-r--r--ui/base/resource/resource_bundle_gtk.cc6
-rw-r--r--ui/base/resource/resource_bundle_mac.mm16
-rw-r--r--ui/base/resource/resource_bundle_win.cc14
-rw-r--r--ui/base/strings/ui_strings.gyp2
6 files changed, 40 insertions, 27 deletions
diff --git a/ui/base/resource/resource_bundle_android.cc b/ui/base/resource/resource_bundle_android.cc
index d5f7316..141d3af 100644
--- a/ui/base/resource/resource_bundle_android.cc
+++ b/ui/base/resource/resource_bundle_android.cc
@@ -31,9 +31,11 @@ namespace ui {
void ResourceBundle::LoadCommonResources() {
AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"),
SCALE_FACTOR_100P);
- AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_standard.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath(
+ "theme_resources_100_percent.pak"),
SCALE_FACTOR_100P);
- AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_standard.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath(
+ "ui_resources_100_percent.pak"),
SCALE_FACTOR_100P);
}
diff --git a/ui/base/resource/resource_bundle_aurax11.cc b/ui/base/resource/resource_bundle_aurax11.cc
index bdb6fcc..f443e57 100644
--- a/ui/base/resource/resource_bundle_aurax11.cc
+++ b/ui/base/resource/resource_bundle_aurax11.cc
@@ -44,29 +44,36 @@ void ResourceBundle::LoadCommonResources() {
if (ui::GetDisplayLayout() == ui::LAYOUT_TOUCH) {
// 1x touch
- AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath(
+ "theme_resources_touch_100_percent.pak"),
SCALE_FACTOR_100P);
- AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_touch.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath(
+ "ui_resources_touch_100_percent.pak"),
SCALE_FACTOR_100P);
if (ShouldLoad2xResources()) {
// 2x touch
AddDataPackFromPath(
- GetResourcesPakFilePath("theme_resources_touch_2x.pak"),
+ GetResourcesPakFilePath("theme_resources_touch_200_percent.pak"),
SCALE_FACTOR_200P);
- AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_touch_2x.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath(
+ "ui_resources_touch_200_percent.pak"),
SCALE_FACTOR_200P);
}
} else {
// 1x non touch
- AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_standard.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath(
+ "theme_resources_100_percent.pak"),
SCALE_FACTOR_100P);
- AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_standard.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath(
+ "ui_resources_100_percent.pak"),
SCALE_FACTOR_100P);
if (ShouldLoad2xResources()) {
// 2x non touch
- AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_2x.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath(
+ "theme_resources_200_percent.pak"),
SCALE_FACTOR_200P);
- AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_2x.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath(
+ "ui_resources_200_percent.pak"),
SCALE_FACTOR_200P);
}
}
diff --git a/ui/base/resource/resource_bundle_gtk.cc b/ui/base/resource/resource_bundle_gtk.cc
index 2b90f5b..628ad48 100644
--- a/ui/base/resource/resource_bundle_gtk.cc
+++ b/ui/base/resource/resource_bundle_gtk.cc
@@ -67,9 +67,11 @@ FilePath GetResourcesPakFilePath(const std::string& pak_name) {
void ResourceBundle::LoadCommonResources() {
AddDataPackFromPath(GetResourcesPakFilePath("chrome.pak"),
SCALE_FACTOR_100P);
- AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_standard.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath(
+ "theme_resources_100_percent.pak"),
SCALE_FACTOR_100P);
- AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_standard.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath(
+ "ui_resources_100_percent.pak"),
SCALE_FACTOR_100P);
}
diff --git a/ui/base/resource/resource_bundle_mac.mm b/ui/base/resource/resource_bundle_mac.mm
index c18a740..4c46218 100644
--- a/ui/base/resource/resource_bundle_mac.mm
+++ b/ui/base/resource/resource_bundle_mac.mm
@@ -51,19 +51,19 @@ FilePath GetResourcesPakFilePath(NSString* name, NSString* mac_locale) {
void ResourceBundle::LoadCommonResources() {
AddDataPackFromPath(GetResourcesPakFilePath(@"chrome", nil),
SCALE_FACTOR_100P);
- AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_standard", nil),
- SCALE_FACTOR_100P);
- AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_standard", nil),
- SCALE_FACTOR_100P);
+ AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_100_percent",
+ nil), SCALE_FACTOR_100P);
+ AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_100_percent",
+ nil), SCALE_FACTOR_100P);
// On Windows and ChromeOS we load either the 1x resource or the 2x resource.
// On Mac we load both and let the UI framework decide which one to use.
#if defined(ENABLE_HIDPI)
if (base::mac::IsOSLionOrLater()) {
- AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_2x", nil),
- SCALE_FACTOR_200P);
- AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_2x", nil),
- SCALE_FACTOR_200P);
+ AddDataPackFromPath(GetResourcesPakFilePath(@"theme_resources_200_percent",
+ nil), SCALE_FACTOR_200P);
+ AddDataPackFromPath(GetResourcesPakFilePath(@"ui_resources_200_percent",
+ nil), SCALE_FACTOR_200P);
}
#endif
}
diff --git a/ui/base/resource/resource_bundle_win.cc b/ui/base/resource/resource_bundle_win.cc
index 7ef486a..bba84d4 100644
--- a/ui/base/resource/resource_bundle_win.cc
+++ b/ui/base/resource/resource_bundle_win.cc
@@ -49,24 +49,26 @@ void ResourceBundle::LoadCommonResources() {
switch (ui::GetDisplayLayout()) {
case ui::LAYOUT_TOUCH:
AddDataPackFromPath(
- GetResourcesPakFilePath("theme_resources_touch_1x.pak"),
+ GetResourcesPakFilePath("theme_resources_touch_100_percent.pak"),
SCALE_FACTOR_100P);
AddDataPackFromPath(
- GetResourcesPakFilePath("ui_resources_standard.pak"),
+ GetResourcesPakFilePath("ui_resources_100_percent.pak"),
SCALE_FACTOR_100P);
break;
default:
if (use_hidpi) {
- AddDataPackFromPath(GetResourcesPakFilePath("theme_resources_2x.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath(
+ "theme_resources_200_percent.pak"),
SCALE_FACTOR_200P);
- AddDataPackFromPath(GetResourcesPakFilePath("ui_resources_2x.pak"),
+ AddDataPackFromPath(GetResourcesPakFilePath(
+ "ui_resources_200_percent.pak"),
SCALE_FACTOR_200P);
} else {
AddDataPackFromPath(
- GetResourcesPakFilePath("theme_resources_standard.pak"),
+ GetResourcesPakFilePath("theme_resources_100_percent.pak"),
SCALE_FACTOR_100P);
AddDataPackFromPath(
- GetResourcesPakFilePath("ui_resources_standard.pak"),
+ GetResourcesPakFilePath("ui_resources_100_percent.pak"),
SCALE_FACTOR_100P);
}
break;
diff --git a/ui/base/strings/ui_strings.gyp b/ui/base/strings/ui_strings.gyp
index 7adde77..2ac5d00 100644
--- a/ui/base/strings/ui_strings.gyp
+++ b/ui/base/strings/ui_strings.gyp
@@ -65,7 +65,7 @@
{
'destination': '<(PRODUCT_DIR)/ui_unittests_strings',
'files': [
- '<(grit_base_out_dir)/ui_resources/ui_resources_standard.pak',
+ '<(grit_base_out_dir)/ui_resources/ui_resources_100_percent.pak',
],
},
],
generated by cgit v1.1 at 2025-02-15 17:05:15 +0000