summaryrefslogtreecommitdiffstats
path: root/base/base.gyp
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-18 07:29:56 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-18 07:29:56 +0000
commite41d7ddd66de84c0d521358d1478d9da77384563 (patch)
tree796268f8f8b66753c41eebb8c95d8c9a53872760 /base/base.gyp
parent6e20962febbab9e523976d0cc792710bf6daf521 (diff)
downloadchromium_src-e41d7ddd66de84c0d521358d1478d9da77384563.zip
chromium_src-e41d7ddd66de84c0d521358d1478d9da77384563.tar.gz
chromium_src-e41d7ddd66de84c0d521358d1478d9da77384563.tar.bz2
Move SystemMonitor to base/.
I plan to use SystemMonitor in net/. Fix up the Mac implementation not to use Cocoa APIs since @interface is not allowed in base. BUG=none TEST=none Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=85732 Review URL: http://codereview.chromium.org/7015017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85737 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'base/base.gyp')
-rw-r--r--base/base.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/base/base.gyp b/base/base.gyp
index 8514894..68974f5 100644
--- a/base/base.gyp
+++ b/base/base.gyp
@@ -186,6 +186,7 @@
'sys_info_unittest.cc',
'sys_string_conversions_mac_unittest.mm',
'sys_string_conversions_unittest.cc',
+ 'system_monitor/system_monitor_unittest.cc',
'task_queue_unittest.cc',
'task_unittest.cc',
'template_util_unittest.cc',
@@ -283,7 +284,6 @@
['exclude', '^win/'],
],
'sources!': [
- 'system_monitor_unittest.cc',
'time_win_unittest.cc',
'trace_event_win_unittest.cc',
'win_util_unittest.cc',