diff options
| author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 04:00:32 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-17 04:00:32 +0000 |
| commit | cf06693e40afbc3ee50cb260739c3ef0d5ab1688 (patch) | |
| tree | 7c2d05512351712bf236a5aaead33778293e0442 /chrome/chrome_resources.gyp | |
| parent | 95991b1967e509c94c3eb6bb0750fafd398c863c (diff) | |
| download | chromium_src-cf06693e40afbc3ee50cb260739c3ef0d5ab1688.zip chromium_src-cf06693e40afbc3ee50cb260739c3ef0d5ab1688.tar.gz chromium_src-cf06693e40afbc3ee50cb260739c3ef0d5ab1688.tar.bz2 | |
Revert 132517 - 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
TBR=sail@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10103022
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132529 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_resources.gyp')
| -rw-r--r-- | chrome/chrome_resources.gyp | 33 |
1 files changed, 0 insertions, 33 deletions
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index d821e5e..9834578 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -219,39 +219,6 @@ }, ], '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', |