| Index: chrome/worker/worker_main.cc
|
| ===================================================================
|
| --- chrome/worker/worker_main.cc (revision 71446)
|
| +++ chrome/worker/worker_main.cc (working copy)
|
| @@ -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 @@
|
| MessageLoop main_message_loop;
|
| base::PlatformThread::SetName("CrWorkerMain");
|
|
|
| - SystemMonitor system_monitor;
|
| + ui::SystemMonitor system_monitor;
|
| HighResolutionTimerManager hi_res_timer_manager;
|
|
|
| ChildProcess worker_process;
|
|
|