diff options
| author | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 07:14:08 +0000 |
|---|---|---|
| committer | willchan@chromium.org <willchan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-05-18 07:14:08 +0000 |
| commit | 5f988b937aedc6facdd9854ad3fc7fbdf6c9f894 (patch) | |
| tree | ef48163d1446a13e8981b0dfbbcb906bcf2c867b /content/renderer/renderer_main.cc | |
| parent | 263d2140c09aab094d045eb0736b22236290dd6d (diff) | |
| download | chromium_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 'content/renderer/renderer_main.cc')
| -rw-r--r-- | content/renderer/renderer_main.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/renderer/renderer_main.cc b/content/renderer/renderer_main.cc index 2551e14..36c73ba 100644 --- a/content/renderer/renderer_main.cc +++ b/content/renderer/renderer_main.cc @@ -19,7 +19,6 @@ #include "base/path_service.h" #include "base/process_util.h" #include "base/string_util.h" -#include "base/system_monitor/system_monitor.h" #include "base/threading/platform_thread.h" #include "base/time.h" #include "content/common/content_counters.h" @@ -30,6 +29,7 @@ #include "content/renderer/render_process_impl.h" #include "content/renderer/render_thread.h" #include "content/renderer/renderer_main_platform_delegate.h" +#include "ui/base/system_monitor/system_monitor.h" #include "ui/base/ui_base_switches.h" #if defined(OS_MACOSX) @@ -176,7 +176,7 @@ int RendererMain(const MainFunctionParams& parameters) { base::PlatformThread::SetName("CrRendererMain"); - base::SystemMonitor system_monitor; + ui::SystemMonitor system_monitor; HighResolutionTimerManager hi_res_timer_manager; platform.PlatformInitialize(); |