diff options
| author | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-26 04:29:34 +0000 |
|---|---|---|
| committer | oshima@chromium.org <oshima@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-05-26 04:29:34 +0000 |
| commit | b74b4885d8268a943bb9498abbe1d4a288d97f70 (patch) | |
| tree | 4712ab6d431d9587ba7e521c778d76721374e703 /chrome/chrome_repack_chrome.gypi | |
| parent | a28efbdf67dbceeb9a95f60ac0b0d856c4f55f47 (diff) | |
| download | chromium_src-b74b4885d8268a943bb9498abbe1d4a288d97f70.zip chromium_src-b74b4885d8268a943bb9498abbe1d4a288d97f70.tar.gz chromium_src-b74b4885d8268a943bb9498abbe1d4a288d97f70.tar.bz2 | |
Merge native_theme resources into ui_resources_standard
BUG=124566
TEST=none
Review URL: https://chromiumcodereview.appspot.com/10447003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@139178 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_repack_chrome.gypi')
| -rw-r--r-- | chrome/chrome_repack_chrome.gypi | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/chrome/chrome_repack_chrome.gypi b/chrome/chrome_repack_chrome.gypi index 1f0f70a..6ac6632 100644 --- a/chrome/chrome_repack_chrome.gypi +++ b/chrome/chrome_repack_chrome.gypi @@ -16,11 +16,6 @@ '<(SHARED_INTERMEDIATE_DIR)/webkit/webkit_resources.pak', ], 'conditions': [ - ['OS != "mac" or use_aura==1', { - 'pak_inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/ui/native_theme/native_theme_resources.pak', - ] - }], ['enable_extensions==1', { 'pak_inputs': [ '<(grit_out_dir)/extensions_api_resources.pak', |