summaryrefslogtreecommitdiffstats
path: root/chrome/worker
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-19 15:29:47 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-01-19 15:29:47 +0000
commit4ae61df4c13769a3336836e904ce4291cbda1dfe (patch)
tree67a41d3303b5c9f7fffa7d6bd2313cc66786e89a /chrome/worker
parentb92ead1bb92464d0aa36702e6de8d3441534bf12 (diff)
downloadchromium_src-4ae61df4c13769a3336836e904ce4291cbda1dfe.zip
chromium_src-4ae61df4c13769a3336836e904ce4291cbda1dfe.tar.gz
chromium_src-4ae61df4c13769a3336836e904ce4291cbda1dfe.tar.bz2
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 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71797 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/worker')
-rw-r--r--chrome/worker/worker_main.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chrome/worker/worker_main.cc b/chrome/worker/worker_main.cc
index 0ba0e87..c39a4b8 100644
--- a/chrome/worker/worker_main.cc
+++ b/chrome/worker/worker_main.cc
@@ -2,8 +2,6 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#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"
@@ -11,9 +9,11 @@
#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/worker/worker_thread.h"
+#include "ui/base/system_monitor/system_monitor.h"
#if defined(OS_WIN)
#include "chrome/common/sandbox_init_wrapper.h"
@@ -26,7 +26,7 @@ int WorkerMain(const MainFunctionParams& parameters) {
MessageLoop main_message_loop;
base::PlatformThread::SetName("CrWorkerMain");
- SystemMonitor system_monitor;
+ ui::SystemMonitor system_monitor;
HighResolutionTimerManager hi_res_timer_manager;
ChildProcess worker_process;