OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "build/build_config.h" | 5 #include "build/build_config.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #endif | 9 #endif |
10 | 10 |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
12 #include "base/command_line.h" | 12 #include "base/command_line.h" |
13 #include "base/hi_res_timer_manager.h" | 13 #include "base/hi_res_timer_manager.h" |
14 #include "base/message_loop.h" | 14 #include "base/message_loop.h" |
15 #include "base/string_util.h" | 15 #include "base/string_util.h" |
16 #include "base/system_monitor/system_monitor.h" | 16 #include "base/system_monitor/system_monitor.h" |
17 #include "base/threading/platform_thread.h" | 17 #include "base/threading/platform_thread.h" |
18 #include "content/common/child_process.h" | 18 #include "content/common/child_process.h" |
19 #include "content/plugin/plugin_thread.h" | 19 #include "content/plugin/plugin_thread.h" |
20 #include "content/public/common/content_switches.h" | 20 #include "content/public/common/content_switches.h" |
21 #include "content/public/common/main_function_params.h" | 21 #include "content/public/common/main_function_params.h" |
22 | 22 |
23 #if defined(OS_WIN) | 23 #if defined(OS_WIN) |
24 #include "base/win/scoped_com_initializer.h" | 24 #include "base/win/scoped_com_initializer.h" |
25 #include "content/public/common/injection_test_win.h" | 25 #include "content/public/common/injection_test_win.h" |
26 #include "sandbox/win/src/sandbox.h" | 26 #include "sandbox/win/src/sandbox.h" |
27 #elif defined(OS_POSIX) && !defined(OS_MACOSX) | 27 #elif defined(OS_POSIX) && !defined(OS_MACOSX) |
28 #include "base/global_descriptors_posix.h" | 28 #include "base/posix/global_descriptors.h" |
29 #include "ipc/ipc_descriptors.h" | 29 #include "ipc/ipc_descriptors.h" |
30 #endif | 30 #endif |
31 | 31 |
32 namespace content { | 32 namespace content { |
33 | 33 |
34 #if defined(OS_MACOSX) | 34 #if defined(OS_MACOSX) |
35 // Removes our Carbon library interposing from the environment so that it | 35 // Removes our Carbon library interposing from the environment so that it |
36 // doesn't carry into any processes that plugins might start. | 36 // doesn't carry into any processes that plugins might start. |
37 void TrimInterposeEnvironment(); | 37 void TrimInterposeEnvironment(); |
38 | 38 |
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 { | 77 { |
78 ChildProcess plugin_process; | 78 ChildProcess plugin_process; |
79 plugin_process.set_main_thread(new PluginThread()); | 79 plugin_process.set_main_thread(new PluginThread()); |
80 MessageLoop::current()->Run(); | 80 MessageLoop::current()->Run(); |
81 } | 81 } |
82 | 82 |
83 return 0; | 83 return 0; |
84 } | 84 } |
85 | 85 |
86 } // namespace content | 86 } // namespace content |
OLD | NEW |