summaryrefslogtreecommitdiffstats
path: root/base
diff options
context:
space:
mode:
authorsgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-01 21:45:48 +0000
committersgk@google.com <sgk@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2008-08-01 21:45:48 +0000
commit1f9431546f1bafcbe8d5e0127ab8861413487174 (patch)
tree57e37254dede512fd076845448f0c72bb0f81291 /base
parent1ec8244f26aba55652a5ecf660df82563ba8f6bb (diff)
downloadchromium_src-1f9431546f1bafcbe8d5e0127ab8861413487174.zip
chromium_src-1f9431546f1bafcbe8d5e0127ab8861413487174.tar.gz
chromium_src-1f9431546f1bafcbe8d5e0127ab8861413487174.tar.bz2
SCons build:
* Add base\object{,_watcher}.cc. * Add chrome\browser\bookmark_{codec,storage}.cc. * Add chrome\views\frame\browser_window_factory.cc. * Split of app\main.cc into app\chrome_{dll,exe}_main.cc, with added CPPDEFINES for {BROWSER,RENDERER,PLUGIN}_DLL. * Move $CSCRIPT, $PLATFORMSDK* and $VISUAL_STUDIO variables to the win32-specific construction environment. * Remove unnecessary comments. TBR: bradnelson git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base')
-rw-r--r--base/SConscript2
1 files changed, 2 insertions, 0 deletions
diff --git a/base/SConscript b/base/SConscript
index c9087dc..635e7b1 100644
--- a/base/SConscript
+++ b/base/SConscript
@@ -78,6 +78,7 @@ input_files = [
'memory_debug.cc',
'message_loop.cc',
'non_thread_safe.cc',
+ 'object_watcher.cc',
'path_service.cc',
'pe_image.cc',
'pickle.cc',
@@ -234,6 +235,7 @@ test_files = [
'json_writer_unittest.cc',
'linked_ptr_unittest.cc',
'message_loop_unittest.cc',
+ 'object_watcher_unittest.cc',
'path_service_unittest.cc',
'pe_image_unittest.cc',
'pickle_unittest.cc',