Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(389)

Side by Side Diff: chrome/worker/worker_main.cc

Issue 431008: Make SystemMonitor not a Singleton and move it out of base (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: fix ChromeFrame build Created 11 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "app/hi_res_timer_manager.h"
6 #include "app/system_monitor.h"
5 #include "base/command_line.h" 7 #include "base/command_line.h"
6 #include "base/message_loop.h" 8 #include "base/message_loop.h"
7 #include "base/string_util.h" 9 #include "base/string_util.h"
8 #include "base/system_monitor.h"
9 #include "chrome/common/child_process.h" 10 #include "chrome/common/child_process.h"
10 #include "chrome/common/chrome_constants.h" 11 #include "chrome/common/chrome_constants.h"
11 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
12 #include "chrome/common/logging_chrome.h" 13 #include "chrome/common/logging_chrome.h"
13 #include "chrome/common/main_function_params.h" 14 #include "chrome/common/main_function_params.h"
14 #include "chrome/worker/worker_thread.h" 15 #include "chrome/worker/worker_thread.h"
15 16
16 #if defined(OS_WIN) 17 #if defined(OS_WIN)
17 #include "chrome/common/sandbox_init_wrapper.h" 18 #include "chrome/common/sandbox_init_wrapper.h"
18 #include "sandbox/src/sandbox.h" 19 #include "sandbox/src/sandbox.h"
19 #endif 20 #endif
20 21
21 // Mainline routine for running as the worker process. 22 // Mainline routine for running as the worker process.
22 int WorkerMain(const MainFunctionParams& parameters) { 23 int WorkerMain(const MainFunctionParams& parameters) {
23 // The main message loop of the worker process. 24 // The main message loop of the worker process.
24 MessageLoop main_message_loop; 25 MessageLoop main_message_loop;
25 std::wstring app_name = chrome::kBrowserAppName; 26 std::wstring app_name = chrome::kBrowserAppName;
26 PlatformThread::SetName(WideToASCII(app_name + L"_WorkerMain").c_str()); 27 PlatformThread::SetName(WideToASCII(app_name + L"_WorkerMain").c_str());
27 28
28 // Initialize the SystemMonitor 29 SystemMonitor system_monitor;
29 base::SystemMonitor::Start(); 30 HighResolutionTimerManager hi_res_timer_manager;
30 31
31 ChildProcess worker_process; 32 ChildProcess worker_process;
32 worker_process.set_main_thread(new WorkerThread()); 33 worker_process.set_main_thread(new WorkerThread());
33 #if defined(OS_WIN) 34 #if defined(OS_WIN)
34 sandbox::TargetServices* target_services = 35 sandbox::TargetServices* target_services =
35 parameters.sandbox_info_.TargetServices(); 36 parameters.sandbox_info_.TargetServices();
36 if (!target_services) 37 if (!target_services)
37 return false; 38 return false;
38 39
39 target_services->LowerToken(); 40 target_services->LowerToken();
40 #endif 41 #endif
41 42
42 const CommandLine& parsed_command_line = parameters.command_line_; 43 const CommandLine& parsed_command_line = parameters.command_line_;
43 if (parsed_command_line.HasSwitch(switches::kWorkerStartupDialog)) { 44 if (parsed_command_line.HasSwitch(switches::kWorkerStartupDialog)) {
44 ChildProcess::WaitForDebugger(L"Worker"); 45 ChildProcess::WaitForDebugger(L"Worker");
45 } 46 }
46 47
47 // Load the accelerator table from the browser executable and tell the 48 // Load the accelerator table from the browser executable and tell the
48 // message loop to use it when translating messages. 49 // message loop to use it when translating messages.
49 MessageLoop::current()->Run(); 50 MessageLoop::current()->Run();
50 51
51 return 0; 52 return 0;
52 } 53 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698