Skip to content

GitLab

T
tangled
Commit be3b5002 authored by benrg@chromium.org's avatar benrg@chromium.org
Browse files
Options

Remove ui_resources_default_100_percent.rc and theme_resources_default_100_percent.rc 

These files (included in chrome.dll on Windows) have the same contents as the
corresponding .pak files. Aside from wasting space, this indirectly caused bug
137715 (the Windows resources take precedence over .pak file resources even
when not at default_100_percent).

Some day we may consider using Windows resources instead of paks (for all
scales), but right now we don't need these RC files.


BUG=137715,137917
TEST=trybots, visual inspection

Review URL: https://chromiumcodereview.appspot.com/10820003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@148435 0039d316-1c4b-4281-b951-d872f2087c98
parent 356a1774
Show whitespace changes
Inline Side-by-side
Showing with 0 additions and 32 deletions
ash/ash.gyp
View file @ be3b5002
...@@ -454,8 +454,6 @@ ...@@ -454,8 +454,6 @@
'wm/workspace/workspace_event_filter_unittest.cc', 'wm/workspace/workspace_event_filter_unittest.cc',
'wm/workspace/workspace_manager_unittest.cc', 'wm/workspace/workspace_manager_unittest.cc',
'wm/workspace/workspace_window_resizer_unittest.cc', 'wm/workspace/workspace_window_resizer_unittest.cc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
], ],
'conditions': [ 'conditions': [
['use_ibus==1', { ['use_ibus==1', {
...@@ -570,7 +568,6 @@ ...@@ -570,7 +568,6 @@
'shell/window_type_launcher.h', 'shell/window_type_launcher.h',
'shell/window_watcher.cc', 'shell/window_watcher.cc',
'shell/window_watcher.h', 'shell/window_watcher.h',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
'../content/app/startup_helper_win.cc', '../content/app/startup_helper_win.cc',
'../ui/views/test/test_views_delegate.cc', '../ui/views/test/test_views_delegate.cc',
], ],
......
chrome/app/theme/theme_resources.grd
View file @ be3b5002
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
<output filename="theme_resources_200_percent.pak" type="data_package" context="default_200_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_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_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> </outputs>
<release seq="1"> <release seq="1">
<structures fallback_to_low_resolution="true"> <structures fallback_to_low_resolution="true">
......
chrome/chrome_dll.gypi
View file @ be3b5002
...@@ -98,10 +98,8 @@ ...@@ -98,10 +98,8 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.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_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
......
chrome/chrome_tests.gypi
View file @ be3b5002
...@@ -641,11 +641,9 @@ ...@@ -641,11 +641,9 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.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_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
...@@ -2353,11 +2351,9 @@ ...@@ -2353,11 +2351,9 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.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_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
], ],
...@@ -3218,11 +3214,9 @@ ...@@ -3218,11 +3214,9 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.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_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
], ],
...@@ -3479,11 +3473,9 @@ ...@@ -3479,11 +3473,9 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.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_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
], ],
...@@ -3600,11 +3592,9 @@ ...@@ -3600,11 +3592,9 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.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_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
], ],
...@@ -3967,9 +3957,7 @@ ...@@ -3967,9 +3957,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
], ],
'include_dirs': [ 'include_dirs': [
'<(DEPTH)/third_party/wtl/include', '<(DEPTH)/third_party/wtl/include',
...@@ -4086,9 +4074,7 @@ ...@@ -4086,9 +4074,7 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/browser_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
], ],
'include_dirs': [ 'include_dirs': [
'<(DEPTH)/third_party/wtl/include', '<(DEPTH)/third_party/wtl/include',
......
chrome/test/gpu/test_support_gpu.gypi
View file @ be3b5002
...@@ -55,11 +55,9 @@ ...@@ -55,11 +55,9 @@
'<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/common_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/extensions_api_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome/renderer_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_100_percent.rc',
'<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc', '<(SHARED_INTERMEDIATE_DIR)/chrome_version/other_version.rc',
'<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.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_chromium_resources.rc',
'<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.rc',
], ],
......
chrome_frame/chrome_frame.gyp
View file @ be3b5002
...@@ -425,7 +425,6 @@ ...@@ -425,7 +425,6 @@
'test/net/test_automation_resource_message_filter.cc', 'test/net/test_automation_resource_message_filter.cc',
'test/net/test_automation_resource_message_filter.h', 'test/net/test_automation_resource_message_filter.h',
'<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h', '<(SHARED_INTERMEDIATE_DIR)/chrome_frame/chrome_tab.h',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
'test_utils.cc', 'test_utils.cc',
'test_utils.h', 'test_utils.h',
], ],
......
ui/aura/aura.gyp
View file @ be3b5002
...@@ -226,7 +226,6 @@ ...@@ -226,7 +226,6 @@
], ],
'sources': [ 'sources': [
'demo/demo_main.cc', 'demo/demo_main.cc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
], ],
}, },
{ {
...@@ -249,7 +248,6 @@ ...@@ -249,7 +248,6 @@
], ],
'sources': [ 'sources': [
'bench/bench_main.cc', 'bench/bench_main.cc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
], ],
}, },
{ {
...@@ -283,7 +281,6 @@ ...@@ -283,7 +281,6 @@
'event_filter_unittest.cc', 'event_filter_unittest.cc',
'event_unittest.cc', 'event_unittest.cc',
'window_unittest.cc', 'window_unittest.cc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
], ],
'conditions': [ 'conditions': [
# osmesa GL implementation is used on linux. # osmesa GL implementation is used on linux.
......
ui/compositor/compositor.gyp
View file @ be3b5002
...@@ -125,7 +125,6 @@ ...@@ -125,7 +125,6 @@
'test/test_suite.h', 'test/test_suite.h',
'test/test_utils.cc', 'test/test_utils.cc',
'test/test_utils.h', 'test/test_utils.h',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
], ],
'conditions': [ 'conditions': [
# osmesa GL implementation is used on linux. # osmesa GL implementation is used on linux.
......
ui/resources/ui_resources.grd
View file @ be3b5002
...@@ -13,7 +13,6 @@ ...@@ -13,7 +13,6 @@
<output filename="ui_resources_200_percent.pak" type="data_package" context="default_200_percent" /> <output filename="ui_resources_200_percent.pak" type="data_package" context="default_200_percent" />
<output filename="ui_resources_touch_100_percent.pak" type="data_package" context="touch_100_percent" /> <output filename="ui_resources_touch_100_percent.pak" type="data_package" context="touch_100_percent" />
<output filename="ui_resources_touch_200_percent.pak" type="data_package" context="touch_200_percent" /> <output filename="ui_resources_touch_200_percent.pak" type="data_package" context="touch_200_percent" />
<output filename="ui_resources_100_percent.rc" type="rc_all" context="default_100_percent" />
</outputs> </outputs>
<release seq="1"> <release seq="1">
<structures fallback_to_low_resolution="true"> <structures fallback_to_low_resolution="true">
......
ui/ui_unittests.gypi
View file @ be3b5002
...@@ -113,7 +113,6 @@ ...@@ -113,7 +113,6 @@
'test/run_all_unittests.cc', 'test/run_all_unittests.cc',
'test/test_suite.cc', 'test/test_suite.cc',
'test/test_suite.h', 'test/test_suite.h',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
], ],
'include_dirs': [ 'include_dirs': [
'../', '../',
......
ui/views/views.gyp
View file @ be3b5002
...@@ -548,8 +548,6 @@ ...@@ -548,8 +548,6 @@
'widget/native_widget_win_unittest.cc', 'widget/native_widget_win_unittest.cc',
'widget/widget_unittest.cc', 'widget/widget_unittest.cc',
'run_all_unittests.cc', 'run_all_unittests.cc',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
], ],
'conditions': [ 'conditions': [
['OS=="win"', { ['OS=="win"', {
...@@ -705,7 +703,6 @@ ...@@ -705,7 +703,6 @@
'examples/examples_main.cc', 'examples/examples_main.cc',
'test/test_views_delegate.cc', 'test/test_views_delegate.cc',
'test/test_views_delegate.h', 'test/test_views_delegate.h',
'<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc',
], ],
'conditions': [ 'conditions': [
['OS=="win"', { ['OS=="win"', {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment