diff options
| author | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 21:31:07 +0000 |
|---|---|---|
| committer | ben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-14 21:31:07 +0000 |
| commit | 3f03f1f2dfa411916fc5db22e32a05c6360d6bcc (patch) | |
| tree | 51981422445df005dd7f8ae8783459fe18513d95 /chrome/nacl | |
| parent | 44f724478aa3b97e69c1609598b98b2cd03d9670 (diff) | |
| download | chromium_src-3f03f1f2dfa411916fc5db22e32a05c6360d6bcc.zip chromium_src-3f03f1f2dfa411916fc5db22e32a05c6360d6bcc.tar.gz chromium_src-3f03f1f2dfa411916fc5db22e32a05c6360d6bcc.tar.bz2 | |
Revert 71487 - Move SystemMonitor to src/ui/base/system_monitor.
Move HiResTimerManager to src/chrome/common.
BUG=none
TEST=none
TBR=brettw
Review URL: http://codereview.chromium.org/6361002
TBR=ben@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71489 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/nacl')
| -rw-r--r-- | chrome/nacl/nacl_main.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc index cb7fe26..0e63273 100644 --- a/chrome/nacl/nacl_main.cc +++ b/chrome/nacl/nacl_main.cc @@ -8,6 +8,8 @@ #include <windows.h> #endif +#include "app/hi_res_timer_manager.h" +#include "app/system_monitor.h" #include "base/command_line.h" #include "base/message_loop.h" #include "base/string_util.h" @@ -19,14 +21,12 @@ #include "chrome/common/child_process.h" #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_switches.h" -#include "chrome/common/hi_res_timer_manager.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/main_function_params.h" #include "chrome/common/result_codes.h" #include "chrome/common/sandbox_policy.h" #include "chrome/nacl/nacl_main_platform_delegate.h" #include "chrome/nacl/nacl_thread.h" -#include "ui/base/system_monitor/system_monitor.h" #if defined(OS_WIN) #include "chrome/nacl/broker_thread.h" @@ -43,7 +43,7 @@ int NaClBrokerMain(const MainFunctionParams& parameters) { MessageLoopForIO main_message_loop; base::PlatformThread::SetName("CrNaClBrokerMain"); - ui::SystemMonitor system_monitor; + SystemMonitor system_monitor; HighResolutionTimerManager hi_res_timer_manager; const CommandLine& parsed_command_line = parameters.command_line_; @@ -111,7 +111,7 @@ int NaClMain(const MainFunctionParams& parameters) { MessageLoopForIO main_message_loop; base::PlatformThread::SetName("CrNaClMain"); - ui::SystemMonitor system_monitor; + SystemMonitor system_monitor; HighResolutionTimerManager hi_res_timer_manager; #if defined(OS_WIN) || defined(OS_MACOSX) || defined(OS_LINUX) |