diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 07:04:06 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 07:04:06 +0000 |
| commit | 69803a4f13f3eb26b982e82493672367e984907a (patch) | |
| tree | 7129dda29bb0b45ae287e3d0b8d6c34e83ae98cc /chrome_frame | |
| parent | c7e136fc8a564f1a30ef6214e4f2b5d598cfbe94 (diff) | |
| download | chromium_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 'chrome_frame')
| -rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 08127b9..20e5dea 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -19,6 +19,7 @@ #include "base/path_service.h" #include "base/string_util.h" #include "base/stringprintf.h" +#include "base/system_monitor/system_monitor.h" #include "base/test/test_timeouts.h" #include "base/threading/platform_thread.h" #include "base/win/scoped_comptr.h" @@ -208,7 +209,7 @@ FakeExternalTab::~FakeExternalTab() { void FakeExternalTab::Initialize() { DCHECK(g_browser_process == NULL); - ui::SystemMonitor system_monitor; + base::SystemMonitor system_monitor; icu_util::Initialize(); |