diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 18:25:46 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-04-30 18:25:46 +0000 |
| commit | 0e0e64830c7da8df1b19a0de657a075a14279ecf (patch) | |
| tree | 34a151969347b71776f1c1ef1caa0486858b04a1 | |
| parent | 526657d45abd72067ff774c552cc4df5825fc742 (diff) | |
| download | chromium_src-0e0e64830c7da8df1b19a0de657a075a14279ecf.zip chromium_src-0e0e64830c7da8df1b19a0de657a075a14279ecf.tar.gz chromium_src-0e0e64830c7da8df1b19a0de657a075a14279ecf.tar.bz2 | |
Move theme_dir to where it'll be found post-r46091.
Review URL: http://codereview.chromium.org/1808005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@46093 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/chrome_dll.gypi | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi index b4a3bd2..89e110a 100644 --- a/chrome/chrome_dll.gypi +++ b/chrome/chrome_dll.gypi @@ -299,6 +299,13 @@ }, ], 'variables': { + 'conditions': [ + ['branding=="Chrome"', { + 'theme_dir_name': 'google_chrome', + }, { # else: 'branding!="Chrome" + 'theme_dir_name': 'chromium', + }], + ], 'repack_path': '../tools/data_pack/repack.py', }, 'actions': [ @@ -455,15 +462,6 @@ ], }], # mac_breakpad ['mac_keystone==1', { - 'variables': { - 'conditions': [ - ['branding=="Chrome"', { - 'theme_dir_name': 'google_chrome', - }, { # else: 'branding!="Chrome" - 'theme_dir_name': 'chromium', - }], - ], - }, 'mac_bundle_resources': [ 'browser/cocoa/keystone_promote_preflight.sh', 'browser/cocoa/keystone_promote_postflight.sh', |