OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 "base/debug/debugger.h" | 5 #include "base/debug/debugger.h" |
6 #include "base/message_loop.h" | 6 #include "base/message_loop.h" |
7 #include "chrome/common/chrome_switches.h" | 7 #include "chrome/common/chrome_switches.h" |
8 #include "chrome/common/service_process_util.h" | 8 #include "chrome/common/service_process_util.h" |
9 #include "chrome/service/service_process.h" | 9 #include "chrome/service/service_process.h" |
10 #include "content/common/main_function_params.h" | 10 #include "content/common/main_function_params.h" |
(...skipping 10 matching lines...) Expand all Loading... |
21 main_message_loop.set_thread_name("MainThread"); | 21 main_message_loop.set_thread_name("MainThread"); |
22 if (parameters.command_line_.HasSwitch(switches::kWaitForDebugger)) { | 22 if (parameters.command_line_.HasSwitch(switches::kWaitForDebugger)) { |
23 base::debug::WaitForDebugger(60, true); | 23 base::debug::WaitForDebugger(60, true); |
24 } | 24 } |
25 | 25 |
26 VLOG(1) << "Service process launched: " | 26 VLOG(1) << "Service process launched: " |
27 << parameters.command_line_.GetCommandLineString(); | 27 << parameters.command_line_.GetCommandLineString(); |
28 | 28 |
29 #if defined(OS_MACOSX) | 29 #if defined(OS_MACOSX) |
30 chrome_application_mac::RegisterCrApp(); | 30 chrome_application_mac::RegisterCrApp(); |
| 31 chrome_application_mac::SetHandler(); |
31 #endif | 32 #endif |
32 | 33 |
33 base::PlatformThread::SetName("CrServiceMain"); | 34 base::PlatformThread::SetName("CrServiceMain"); |
34 | 35 |
35 // If there is already a service process running, quit now. | 36 // If there is already a service process running, quit now. |
36 scoped_ptr<ServiceProcessState> state(new ServiceProcessState); | 37 scoped_ptr<ServiceProcessState> state(new ServiceProcessState); |
37 if (!state->Initialize()) | 38 if (!state->Initialize()) |
38 return 0; | 39 return 0; |
39 | 40 |
40 #if defined(OS_WIN) | 41 #if defined(OS_WIN) |
41 sandbox::BrokerServices* broker_services = | 42 sandbox::BrokerServices* broker_services = |
42 parameters.sandbox_info_.BrokerServices(); | 43 parameters.sandbox_info_.BrokerServices(); |
43 if (broker_services) | 44 if (broker_services) |
44 sandbox::InitBrokerServices(broker_services); | 45 sandbox::InitBrokerServices(broker_services); |
45 #endif // defined(OS_WIN) | 46 #endif // defined(OS_WIN) |
46 | 47 |
47 ServiceProcess service_process; | 48 ServiceProcess service_process; |
48 if (service_process.Initialize(&main_message_loop, | 49 if (service_process.Initialize(&main_message_loop, |
49 parameters.command_line_, | 50 parameters.command_line_, |
50 state.release())) { | 51 state.release())) { |
51 MessageLoop::current()->Run(); | 52 MessageLoop::current()->Run(); |
52 } else { | 53 } else { |
53 LOG(ERROR) << "Service process failed to initialize"; | 54 LOG(ERROR) << "Service process failed to initialize"; |
54 } | 55 } |
55 service_process.Teardown(); | 56 service_process.Teardown(); |
56 return 0; | 57 return 0; |
57 } | 58 } |
OLD | NEW |