diff options
| author | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 02:12:11 +0000 |
|---|---|---|
| committer | sail@chromium.org <sail@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 02:12:11 +0000 |
| commit | 2e317bffec137548f6240fff37b70b5f4b372740 (patch) | |
| tree | 3db7b06819fcd1e729530a801dccaa74653a2644 /chrome/chrome_resources.gyp | |
| parent | 83d9dc34879eb006cb7f3ba53f0e6ec5e24772a9 (diff) | |
| download | chromium_src-2e317bffec137548f6240fff37b70b5f4b372740.zip chromium_src-2e317bffec137548f6240fff37b70b5f4b372740.tar.gz chromium_src-2e317bffec137548f6240fff37b70b5f4b372740.tar.bz2 | |
Metro/HiDPI: Move 1x icons into separate pak file
Currently all 1x art files are repacked into chrome.pak files.
This is a problem on Windows where we want to choose which pak file to load based on metro and DPI scale.
As a first step this CL does the following:
- add a new enable_hidpi build flag. This allows us to test HiDPI mode on Windows Chrome.
- stop packing theme_resources_standard.pak and ui_resources_standard.pak into chrome.pak
- update the Mac and Windows installer code to package the extra pak files.
Note, I'll be updating the Linux installer script in a separate CL. I'm still looking into the ChromeOS situation.
BUG=114311
TEST=Ran on Windows, and Mac and Linux.
Review URL: http://codereview.chromium.org/10024050
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132517 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_resources.gyp')
| -rw-r--r-- | chrome/chrome_resources.gyp | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index 9834578..d821e5e 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -219,6 +219,39 @@ }, ], 'includes': [ '../build/grit_target.gypi' ], + 'conditions': [ + ['OS != "mac"', { + # Copy pak files to the product directory. These files will be picked + # up by the following installer scripts: + # - Windows: chrome/installer/mini_installer/chrome.release + # - Linux: chrome/installer/linux/internal/common/installer.include + # Ensure that the above scripts are updated when adding or removing + # pak files. + # Coping files to the product directory is not needed on the Mac + # since the framework build phase will copy them into the framework + # bundle directly. + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)', + 'files': [ + '<(grit_out_dir)/theme_resources_standard.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_standard/ui_resources_standard.pak', + ], + }, + ], + }], + ['OS != "mac" and enable_hidpi == 1', { + 'copies': [ + { + 'destination': '<(PRODUCT_DIR)', + 'files': [ + '<(grit_out_dir)/theme_resources_2x.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_2x/ui_resources_2x.pak', + ], + }, + ], + }], + ], }, { 'target_name': 'packed_extra_resources', |