summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-18 07:04:06 +0000
committerwillchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-05-18 07:04:06 +0000
commit69803a4f13f3eb26b982e82493672367e984907a (patch)
tree7129dda29bb0b45ae287e3d0b8d6c34e83ae98cc /app
parentc7e136fc8a564f1a30ef6214e4f2b5d598cfbe94 (diff)
downloadchromium_src-69803a4f13f3eb26b982e82493672367e984907a.zip
chromium_src-69803a4f13f3eb26b982e82493672367e984907a.tar.gz
chromium_src-69803a4f13f3eb26b982e82493672367e984907a.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 Review URL: http://codereview.chromium.org/7015017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@85732 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'app')
-rw-r--r--app/app.gyp1
-rw-r--r--app/app_base.gypi5
2 files changed, 0 insertions, 6 deletions
diff --git a/app/app.gyp b/app/app.gyp
index 955a6d6..e639728 100644
--- a/app/app.gyp
+++ b/app/app.gyp
@@ -41,7 +41,6 @@
'../ui/base/models/tree_node_model_unittest.cc',
'../ui/base/resource/data_pack_unittest.cc',
'../ui/base/resource/resource_bundle_unittest.cc',
- '../ui/base/system_monitor/system_monitor_unittest.cc',
'../ui/base/test/data/resource.h',
'../ui/base/text/text_elider_unittest.cc',
'../ui/base/view_prop_unittest.cc',
diff --git a/app/app_base.gypi b/app/app_base.gypi
index 82c3962..a52e391 100644
--- a/app/app_base.gypi
+++ b/app/app_base.gypi
@@ -18,11 +18,6 @@
'../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',