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 /chrome/nacl/nacl_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 'chrome/nacl/nacl_main.cc')
| -rw-r--r-- | chrome/nacl/nacl_main.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc index f2e0cbf..51c57b8 100644 --- a/chrome/nacl/nacl_main.cc +++ b/chrome/nacl/nacl_main.cc @@ -11,7 +11,6 @@ #include "base/command_line.h" #include "base/message_loop.h" #include "base/string_util.h" -#include "base/system_monitor/system_monitor.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" #include "chrome/common/logging_chrome.h" @@ -22,6 +21,7 @@ #include "content/common/hi_res_timer_manager.h" #include "content/common/main_function_params.h" #include "content/common/result_codes.h" +#include "ui/base/system_monitor/system_monitor.h" #if defined(OS_WIN) #include "chrome/nacl/broker_thread.h" @@ -37,7 +37,7 @@ int NaClBrokerMain(const MainFunctionParams& parameters) { MessageLoopForIO main_message_loop; base::PlatformThread::SetName("CrNaClBrokerMain"); - base::SystemMonitor system_monitor; + ui::SystemMonitor system_monitor; HighResolutionTimerManager hi_res_timer_manager; const CommandLine& parsed_command_line = parameters.command_line_; @@ -101,7 +101,7 @@ int NaClMain(const MainFunctionParams& parameters) { MessageLoopForIO main_message_loop; base::PlatformThread::SetName("CrNaClMain"); - base::SystemMonitor system_monitor; + ui::SystemMonitor system_monitor; HighResolutionTimerManager hi_res_timer_manager; #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) |