summaryrefslogtreecommitdiffstats
path: root/app/app_base.gypi
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-18 07:14:08 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-18 07:14:08 +0000
commit5f988b937aedc6facdd9854ad3fc7fbdf6c9f894 (patch)
treeef48163d1446a13e8981b0dfbbcb906bcf2c867b /app/app_base.gypi
parent263d2140c09aab094d045eb0736b22236290dd6d (diff)
downloadchromium_src-5f988b937aedc6facdd9854ad3fc7fbdf6c9f894.zip
chromium_src-5f988b937aedc6facdd9854ad3fc7fbdf6c9f894.tar.gz
chromium_src-5f988b937aedc6facdd9854ad3fc7fbdf6c9f894.tar.bz2
Revert 85732 (broke build) - 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 Review URL: http://codereview.chromium.org/7015017 TBR=willchan@chromium.org Review URL: http://codereview.chromium.org/7042003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85734 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app/app_base.gypi')
-rw-r--r--app/app_base.gypi5
1 files changed, 5 insertions, 0 deletions
diff --git a/app/app_base.gypi b/app/app_base.gypi
index a52e391..82c3962 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -18,6 +18,11 @@
'../ui/base/models/tree_model.h',
'../ui/base/models/tree_node_iterator.h',
'../ui/base/models/tree_node_model.h',
+ '../ui/base/system_monitor/system_monitor.cc',
+ '../ui/base/system_monitor/system_monitor.h',
+ '../ui/base/system_monitor/system_monitor_mac.mm',
+ '../ui/base/system_monitor/system_monitor_posix.cc',
+ '../ui/base/system_monitor/system_monitor_win.cc',
'../ui/base/ui_base_paths.h',
'../ui/base/ui_base_paths.cc',
'../ui/base/ui_base_switches.h',