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 "content/browser/utility_process_host_impl.h" | 5 #include "content/browser/utility_process_host_impl.h" |
6 | 6 |
7 #include <utility> | 7 #include <utility> |
8 | 8 |
9 #include "base/base_switches.h" | 9 #include "base/base_switches.h" |
10 #include "base/bind.h" | 10 #include "base/bind.h" |
(...skipping 21 matching lines...) Expand all Loading... |
32 #include "content/public/browser/browser_thread.h" | 32 #include "content/public/browser/browser_thread.h" |
33 #include "content/public/browser/content_browser_client.h" | 33 #include "content/public/browser/content_browser_client.h" |
34 #include "content/public/browser/utility_process_host_client.h" | 34 #include "content/public/browser/utility_process_host_client.h" |
35 #include "content/public/common/content_switches.h" | 35 #include "content/public/common/content_switches.h" |
36 #include "content/public/common/mojo_channel_switches.h" | 36 #include "content/public/common/mojo_channel_switches.h" |
37 #include "content/public/common/process_type.h" | 37 #include "content/public/common/process_type.h" |
38 #include "content/public/common/sandbox_type.h" | 38 #include "content/public/common/sandbox_type.h" |
39 #include "content/public/common/sandboxed_process_launcher_delegate.h" | 39 #include "content/public/common/sandboxed_process_launcher_delegate.h" |
40 #include "content/public/common/service_manager_connection.h" | 40 #include "content/public/common/service_manager_connection.h" |
41 #include "content/public/common/service_names.mojom.h" | 41 #include "content/public/common/service_names.mojom.h" |
| 42 #include "media/base/media_switches.h" |
42 #include "mojo/edk/embedder/embedder.h" | 43 #include "mojo/edk/embedder/embedder.h" |
43 #include "services/service_manager/public/cpp/interface_provider.h" | 44 #include "services/service_manager/public/cpp/interface_provider.h" |
44 #include "ui/base/ui_base_switches.h" | 45 #include "ui/base/ui_base_switches.h" |
45 | 46 |
46 #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) | 47 #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) |
47 #include "content/public/browser/zygote_handle_linux.h" | 48 #include "content/public/browser/zygote_handle_linux.h" |
48 #endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) | 49 #endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) |
49 | 50 |
50 #if defined(OS_WIN) | 51 #if defined(OS_WIN) |
51 #include "sandbox/win/src/sandbox_policy.h" | 52 #include "sandbox/win/src/sandbox_policy.h" |
(...skipping 252 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
304 switches::kIgnoreCertificateErrors, | 305 switches::kIgnoreCertificateErrors, |
305 switches::kLogNetLog, | 306 switches::kLogNetLog, |
306 switches::kNoSandbox, | 307 switches::kNoSandbox, |
307 switches::kProfilerTiming, | 308 switches::kProfilerTiming, |
308 switches::kProxyServer, | 309 switches::kProxyServer, |
309 switches::kTestingFixedHttpPort, | 310 switches::kTestingFixedHttpPort, |
310 switches::kTestingFixedHttpsPort, | 311 switches::kTestingFixedHttpsPort, |
311 #if defined(OS_MACOSX) | 312 #if defined(OS_MACOSX) |
312 switches::kEnableSandboxLogging, | 313 switches::kEnableSandboxLogging, |
313 #endif | 314 #endif |
| 315 switches::kUseFakeDeviceForMediaStream, |
| 316 switches::kUseFileForFakeVideoCapture, |
314 }; | 317 }; |
315 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 318 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
316 arraysize(kSwitchNames)); | 319 arraysize(kSwitchNames)); |
317 | 320 |
318 if (has_cmd_prefix) { | 321 if (has_cmd_prefix) { |
319 // Launch the utility child process with some prefix | 322 // Launch the utility child process with some prefix |
320 // (usually "xterm -e gdb --args"). | 323 // (usually "xterm -e gdb --args"). |
321 cmd_line->PrependWrapper(browser_command_line.GetSwitchValueNative( | 324 cmd_line->PrependWrapper(browser_command_line.GetSwitchValueNative( |
322 switches::kUtilityCmdPrefix)); | 325 switches::kUtilityCmdPrefix)); |
323 } | 326 } |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
389 base::WeakPtr<UtilityProcessHostImpl> host, | 392 base::WeakPtr<UtilityProcessHostImpl> host, |
390 int error_code) { | 393 int error_code) { |
391 if (!host) | 394 if (!host) |
392 return; | 395 return; |
393 | 396 |
394 host->OnProcessLaunchFailed(error_code); | 397 host->OnProcessLaunchFailed(error_code); |
395 delete host.get(); | 398 delete host.get(); |
396 } | 399 } |
397 | 400 |
398 } // namespace content | 401 } // namespace content |
OLD | NEW |