diff options
| author | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-18 19:37:49 +0000 |
|---|---|---|
| committer | rlarocque@chromium.org <rlarocque@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-07-18 19:37:49 +0000 |
| commit | f8126f5ef7fc32ab6132ebd5aaf59d408b11d5fd (patch) | |
| tree | d9e4007577c580fee5dc364484809ff1a682e405 /chrome/chrome_dll.gypi | |
| parent | fcd4ccd070f7ee5c6b8d27d47a5784e752a14856 (diff) | |
| download | chromium_src-f8126f5ef7fc32ab6132ebd5aaf59d408b11d5fd.zip chromium_src-f8126f5ef7fc32ab6132ebd5aaf59d408b11d5fd.tar.gz chromium_src-f8126f5ef7fc32ab6132ebd5aaf59d408b11d5fd.tar.bz2 | |
Revert 147288 - Renamed resource files to be more verbose, specifically:
[ui,theme]_resources_standard.[pak,rc] changed to .._resources_100_percent..
and likewise
[ui,theme]_resources_2x.pak changed to .._resources_200_percent.pak
BUG=120185
TEST=run chome,ash_shell confirm assets loaded
Review URL: https://chromiumcodereview.appspot.com/10694170
TBR=harrym@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10806018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147293 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_dll.gypi')
| -rw-r--r-- | chrome/chrome_dll.gypi | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index b309844..6619dc1 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_100_percent.rc', + '<(SHARED_INTERMEDIATE_DIR)/chrome/theme_resources_standard.rc', '<(SHARED_INTERMEDIATE_DIR)/content/content_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/net/net_resources.rc', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.rc', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.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_100_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_100_percent.pak', + '<(grit_out_dir)/theme_resources_standard.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_standard.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_200_percent.pak', - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_200_percent.pak', + '<(grit_out_dir)/theme_resources_2x.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources/ui_resources_2x.pak', ], }], ], # conditions |