diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 17:56:06 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-02 17:56:06 +0000 |
| commit | 6155e70162b8334699c97e7452578d427bdb82ab (patch) | |
| tree | 77781ec29589a46b7d860b5cbe111f2f80513cfd /chrome/chrome_resources.gyp | |
| parent | f44b9f0defaba2f37a2d0b34432852e7b1456764 (diff) | |
| download | chromium_src-6155e70162b8334699c97e7452578d427bdb82ab.zip chromium_src-6155e70162b8334699c97e7452578d427bdb82ab.tar.gz chromium_src-6155e70162b8334699c97e7452578d427bdb82ab.tar.bz2 | |
cros: Use touch theme assets with --touch-optimized-ui
This follows the same pattern for theme_resources_touch_1x as we used for ui_resources_touch. I also introduced a gyp flag for enable_touch_ui at sky's suggestion.
BUG=115234
TEST=visual, run with --touch-optimized-ui and see bigger tabstrip and toolbar assets
Review URL: https://chromiumcodereview.appspot.com/10320002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134942 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_resources.gyp')
| -rw-r--r-- | chrome/chrome_resources.gyp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp index 2d4c063..e65ca54 100644 --- a/chrome/chrome_resources.gyp +++ b/chrome/chrome_resources.gyp @@ -237,16 +237,6 @@ '<(DEPTH)/ui/ui.gyp:ui_resources_touch', ], 'conditions': [ - ['chromeos==1', { - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ - '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_touch/ui_resources_touch.pak', - ], - }, - ], - }], ['OS != "mac"', { # Copy pak files to the product directory. These files will be picked # up by the following installer scripts: @@ -254,7 +244,7 @@ # - 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 + # Copying 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': [ @@ -278,12 +268,13 @@ }, ], }], - ['enable_metro == 1', { + ['enable_touch_ui==1', { 'copies': [ { 'destination': '<(PRODUCT_DIR)', 'files': [ '<(grit_out_dir)/theme_resources_touch_1x.pak', + '<(SHARED_INTERMEDIATE_DIR)/ui/ui_resources_touch/ui_resources_touch.pak', ], }, ], |