summaryrefslogtreecommitdiffstats
path: root/chrome
diff options
context:
space:
mode:
authormark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-28 02:02:47 +0000
committermark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-02-28 02:02:47 +0000
commit296d2ffad3adc619482b273ed6688f3e1361c61e (patch)
tree630339bd96ce2ca3c9ae9e9f236134985cd389cf /chrome
parent5ae0b8611da6aa21e2cd74389eb64e3f064c5e54 (diff)
downloadchromium_src-296d2ffad3adc619482b273ed6688f3e1361c61e.zip
chromium_src-296d2ffad3adc619482b273ed6688f3e1361c61e.tar.gz
chromium_src-296d2ffad3adc619482b273ed6688f3e1361c61e.tar.bz2
Bring chrome.gyp up to date with Chromium r10668
Review URL: http://codereview.chromium.org/27304 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@10673 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome')
-rw-r--r--chrome/chrome.gyp8
1 files changed, 6 insertions, 2 deletions
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 3adc429..6b8bb80 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -453,6 +453,8 @@
'browser/download/download_request_dialog_delegate_win.h',
'browser/download/download_request_manager.cc',
'browser/download/download_request_manager.h',
+ 'browser/download/download_shelf.cc',
+ 'browser/download/download_shelf.h',
'browser/download/download_util.cc',
'browser/download/download_util.h',
'browser/download/save_file.cc',
@@ -1143,7 +1145,7 @@
# Exclude most of download.
['exclude', '^browser/download/'],
- ['include', '^browser/download/download_(file|manager)\\.cc$'],
+ ['include', '^browser/download/download_(file|manager|shelf)\\.cc$'],
['include', '^browser/download/download_request_manager\\.cc$'],
['include', '^browser/download/save_(file(_manager)?|item|package)\\.cc$'],
@@ -1311,7 +1313,7 @@
'renderer',
],
'sources': [
- # All .cc, .h, and .mm files under app except for tests.
+ # All .cc, .h, .m, and .mm files under app except for tests.
'app/breakpad.cc',
'app/breakpad.h',
'app/chrome_dll_main.cc',
@@ -1324,6 +1326,8 @@
'app/client_util.h',
'app/google_update_client.cc',
'app/google_update_client.h',
+ 'app/keystone_glue.h',
+ 'app/keystone_glue.m',
'app/result_codes.h',
'app/scoped_ole_initializer.h',
],