summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
Diffstat (limited to 'chrome')
-rw-r--r--chrome/app/theme/theme_resources.grd10
-rw-r--r--chrome/browser_tests.isolate4
-rw-r--r--chrome/chrome_dll.gypi12
-rw-r--r--chrome/chrome_resources.gyp16
-rw-r--r--chrome/chrome_tests.gypi28
-rw-r--r--chrome/installer/mini_installer/chrome.release10
-rw-r--r--chrome/test/gpu/test_support_gpu.gypi4
-rw-r--r--chrome/tools/build/chromeos/FILES.cfg4
-rw-r--r--chrome/tools/build/linux/FILES.cfg4
-rw-r--r--chrome/tools/build/win/FILES.cfg10
-rw-r--r--chrome/unit_tests.isolate4
11 files changed, 53 insertions, 53 deletions
diff --git a/chrome/app/theme/theme_resources.grd b/chrome/app/theme/theme_resources.grd
index d0f91c5..55c2081 100644
--- a/chrome/app/theme/theme_resources.grd
+++ b/chrome/app/theme/theme_resources.grd
@@ -6,11 +6,11 @@
</output>
<output filename="grit/theme_resources_map.cc" type="resource_map_source" context="default_100_percent" />
<output filename="grit/theme_resources_map.h" type="resource_map_header" context="default_100_percent" />
- <output filename="theme_resources_standard.pak" type="data_package" context="default_100_percent" />
- <output filename="theme_resources_2x.pak" type="data_package" context="default_200_percent" />
- <output filename="theme_resources_touch_1x.pak" type="data_package" context="touch_100_percent" />
- <output filename="theme_resources_touch_2x.pak" type="data_package" context="touch_200_percent" />
- <output filename="theme_resources_standard.rc" type="rc_all" context="default_100_percent" />
+ <output filename="theme_resources_100_percent.pak" type="data_package" context="default_100_percent" />
+ <output filename="theme_resources_200_percent.pak" type="data_package" context="default_200_percent" />
+ <output filename="theme_resources_touch_100_percent.pak" type="data_package" context="touch_100_percent" />
+ <output filename="theme_resources_touch_200_percent.pak" type="data_package" context="touch_200_percent" />
+ <output filename="theme_resources_100_percent.rc" type="rc_all" context="default_100_percent" />
</outputs>
<release seq="1">
<structures fallback_to_low_resolution="true">
diff --git a/chrome/browser_tests.isolate b/chrome/browser_tests.isolate
index 376b442..0891a5d 100644
--- a/chrome/browser_tests.isolate
+++ b/chrome/browser_tests.isolate
@@ -1176,8 +1176,8 @@
'<(PRODUCT_DIR)/test_data/chrome/test/data/webui/mock4js_browsertest.js',
'<(PRODUCT_DIR)/test_data/chrome/test/data/webui/net_internals/net_internals_test.js',
'<(PRODUCT_DIR)/test_data/chrome/test/data/webui/print_preview.js',
- '<(PRODUCT_DIR)/theme_resources_standard.pak',
- '<(PRODUCT_DIR)/ui_resources_standard.pak',
+ '<(PRODUCT_DIR)/theme_resources_100_percent.pak',
+ '<(PRODUCT_DIR)/ui_resources_100_percent.pak',
'test/data/anchor_download_test.png',
'test/data/clicktoplay.html',
'test/data/download-anchor-attrib.html',
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index 6619dc1..b309844 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -98,10 +98,10 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
@@ -292,8 +292,8 @@
'browser/mac/install.sh',
'<(SHARED_INTERMEDIATE_DIR)/repack/chrome.pak',
'<(SHARED_INTERMEDIATE_DIR)/repack/resources.pak',
- '<(grit_out_dir)/theme_resources_standard.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.pak',
+ '<(grit_out_dir)/theme_resources_100_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
'<!@pymod_do_main(repack_locales -o -g <(grit_out_dir) -s <(SHARED_INTERMEDIATE_DIR) -x <(SHARED_INTERMEDIATE_DIR) <(locales))',
# Note: pseudo_locales are generated via the packed_resources
# dependency but not copied to the final target. See
@@ -534,8 +534,8 @@
}],
['enable_hidpi==1', {
'mac_bundle_resources': [
- '<(grit_out_dir)/theme_resources_2x.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_2x.pak',
+ '<(grit_out_dir)/theme_resources_200_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200_percent.pak',
],
}],
], # conditions
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp
index 78be1d3..85db5e3 100644
--- a/chrome/chrome_resources.gyp
+++ b/chrome/chrome_resources.gyp
@@ -236,8 +236,8 @@
{
'destination': '<(PRODUCT_DIR)',
'files': [
- '<(grit_out_dir)/theme_resources_standard.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.pak',
+ '<(grit_out_dir)/theme_resources_100_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak',
],
},
],
@@ -247,8 +247,8 @@
{
'destination': '<(PRODUCT_DIR)',
'files': [
- '<(grit_out_dir)/theme_resources_2x.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_2x.pak',
+ '<(grit_out_dir)/theme_resources_200_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200_percent.pak',
],
},
],
@@ -258,10 +258,10 @@
{
'destination': '<(PRODUCT_DIR)',
'files': [
- '<(grit_out_dir)/theme_resources_touch_1x.pak',
- '<(grit_out_dir)/theme_resources_touch_2x.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch.pak',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_2x.pak',
+ '<(grit_out_dir)/theme_resources_touch_100_percent.pak',
+ '<(grit_out_dir)/theme_resources_touch_200_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_100_percent.pak',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_touch_200_percent.pak',
],
},
],
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 3ea86d5..0ac766d 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -643,11 +643,11 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
@@ -2355,11 +2355,11 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
],
@@ -3229,11 +3229,11 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
],
@@ -3490,11 +3490,11 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
],
@@ -3611,11 +3611,11 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
],
@@ -3978,9 +3978,9 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
],
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
@@ -4097,9 +4097,9 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
],
'include_dirs': [
'<(DEPTH)/third_party/wtl/include',
diff --git a/chrome/installer/mini_installer/chrome.release b/chrome/installer/mini_installer/chrome.release
index a094ea8..94afa0c 100644
--- a/chrome/installer/mini_installer/chrome.release
+++ b/chrome/installer/mini_installer/chrome.release
@@ -13,8 +13,8 @@ nacl_irt_x86_32.nexe: %(VersionDir)s\
nacl_irt_x86_64.nexe: %(VersionDir)s\
icudt.dll: %(VersionDir)s\
resources.pak: %(VersionDir)s\
-theme_resources_standard.pak: %(VersionDir)s\
-ui_resources_standard.pak: %(VersionDir)s\
+theme_resources_100_percent.pak: %(VersionDir)s\
+ui_resources_100_percent.pak: %(VersionDir)s\
locales\*.pak: %(VersionDir)s\Locales
locales\*.dll: %(VersionDir)s\Locales
npchrome_frame.dll: %(VersionDir)s\
@@ -33,11 +33,11 @@ default_apps\*.crx: %(VersionDir)s\default_apps\
default_apps\external_extensions.json: %(VersionDir)s\default_apps\
[HIDPI]
-theme_resources_2x.pak: %(VersionDir)s\
-ui_resources_2x.pak: %(VersionDir)s\
+theme_resources_200_percent.pak: %(VersionDir)s\
+ui_resources_200_percent.pak: %(VersionDir)s\
[TOUCH]
-theme_resources_touch_1x.pak: %(VersionDir)s\
+theme_resources_touch_100_percent.pak: %(VersionDir)s\
[GOOGLE_CHROME]
FlashPlayerApp.exe: %(VersionDir)s\
diff --git a/chrome/test/gpu/test_support_gpu.gypi b/chrome/test/gpu/test_support_gpu.gypi
index 075ec20..6b580d8 100644
--- a/chrome/test/gpu/test_support_gpu.gypi
+++ b/chrome/test/gpu/test_support_gpu.gypi
@@ -55,11 +55,11 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc',
- '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.rc',
+ '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
],
diff --git a/chrome/tools/build/chromeos/FILES.cfg b/chrome/tools/build/chromeos/FILES.cfg
index 958f6b2..12af170 100644
--- a/chrome/tools/build/chromeos/FILES.cfg
+++ b/chrome/tools/build/chromeos/FILES.cfg
@@ -85,12 +85,12 @@ FILES = [
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'theme_resources_standard.pak',
+ 'filename': 'theme_resources_100_percent.pak',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'ui_resources_standard.pak',
+ 'filename': 'ui_resources_100_percent.pak',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
diff --git a/chrome/tools/build/linux/FILES.cfg b/chrome/tools/build/linux/FILES.cfg
index 7f1457d..502b5bd 100644
--- a/chrome/tools/build/linux/FILES.cfg
+++ b/chrome/tools/build/linux/FILES.cfg
@@ -87,12 +87,12 @@ FILES = [
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'theme_resources_standard.pak',
+ 'filename': 'theme_resources_100_percent.pak',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'ui_resources_standard.pak',
+ 'filename': 'ui_resources_100_percent.pak',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
diff --git a/chrome/tools/build/win/FILES.cfg b/chrome/tools/build/win/FILES.cfg
index 834231e..8d84fdd 100644
--- a/chrome/tools/build/win/FILES.cfg
+++ b/chrome/tools/build/win/FILES.cfg
@@ -351,29 +351,29 @@ FILES = [
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'theme_resources_standard.pak',
+ 'filename': 'theme_resources_100_percent.pak',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'theme_resources_2x.pak',
+ 'filename': 'theme_resources_200_percent.pak',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
'optional': ['dev', 'official'],
},
{
- 'filename': 'theme_resources_touch_1x.pak',
+ 'filename': 'theme_resources_touch_100_percent.pak',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
'optional': ['dev', 'official'],
},
{
- 'filename': 'ui_resources_standard.pak',
+ 'filename': 'ui_resources_100_percent.pak',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
},
{
- 'filename': 'ui_resources_2x.pak',
+ 'filename': 'ui_resources_200_percent.pak',
'arch': ['32bit', '64bit'],
'buildtype': ['dev', 'official'],
'optional': ['dev', 'official'],
diff --git a/chrome/unit_tests.isolate b/chrome/unit_tests.isolate
index cdb7503..3272b4ab 100644
--- a/chrome/unit_tests.isolate
+++ b/chrome/unit_tests.isolate
@@ -622,8 +622,8 @@
'variables': {
'isolate_dependency_tracked': [
'<(PRODUCT_DIR)/locales/en-US.pak',
- '<(PRODUCT_DIR)/theme_resources_standard.pak',
- '<(PRODUCT_DIR)/ui_resources_standard.pak',
+ '<(PRODUCT_DIR)/theme_resources_100_percent.pak',
+ '<(PRODUCT_DIR)/ui_resources_100_percent.pak',
],
'isolate_dependency_untracked': [
'test/data/firefox2_nss/',
generated by cgit v1.1 at 2025-01-18 09:08:38 +0000