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/utility | |
| 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/utility')
| -rw-r--r-- | chrome/utility/utility_main.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/utility/utility_main.cc b/chrome/utility/utility_main.cc index d0159dd..74360c8 100644 --- a/chrome/utility/utility_main.cc +++ b/chrome/utility/utility_main.cc @@ -3,6 +3,8 @@ // found in the LICENSE file. #include "app/app_switches.h" +#include "app/hi_res_timer_manager.h" +#include "app/system_monitor.h" #include "base/command_line.h" #include "base/file_util.h" #include "base/message_loop.h" @@ -13,11 +15,9 @@ #include "chrome/common/chrome_constants.h" #include "chrome/common/chrome_paths.h" #include "chrome/common/extensions/extension_l10n_util.h" -#include "chrome/common/hi_res_timer_manager.h" #include "chrome/common/logging_chrome.h" #include "chrome/common/main_function_params.h" #include "chrome/utility/utility_thread.h" -#include "ui/base/system_monitor/system_monitor.h" #if defined(OS_WIN) #include "chrome/common/chrome_switches.h" @@ -31,7 +31,7 @@ int UtilityMain(const MainFunctionParams& parameters) { MessageLoop main_message_loop; base::PlatformThread::SetName("CrUtilityMain"); - ui::SystemMonitor system_monitor; + SystemMonitor system_monitor; HighResolutionTimerManager hi_res_timer_manager; ChildProcess utility_process; |