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" | |
43 #include "mojo/edk/embedder/embedder.h" | 42 #include "mojo/edk/embedder/embedder.h" |
44 #include "services/service_manager/public/cpp/interface_provider.h" | 43 #include "services/service_manager/public/cpp/interface_provider.h" |
45 #include "ui/base/ui_base_switches.h" | 44 #include "ui/base/ui_base_switches.h" |
46 | 45 |
47 #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) | 46 #if defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) |
48 #include "content/public/browser/zygote_handle_linux.h" | 47 #include "content/public/browser/zygote_handle_linux.h" |
49 #endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) | 48 #endif // defined(OS_POSIX) && !defined(OS_ANDROID) && !defined(OS_MACOSX) |
50 | 49 |
51 #if defined(OS_WIN) | 50 #if defined(OS_WIN) |
52 #include "sandbox/win/src/sandbox_policy.h" | 51 #include "sandbox/win/src/sandbox_policy.h" |
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
306 switches::kIgnoreCertificateErrors, | 305 switches::kIgnoreCertificateErrors, |
307 switches::kLogNetLog, | 306 switches::kLogNetLog, |
308 switches::kNoSandbox, | 307 switches::kNoSandbox, |
309 switches::kProfilerTiming, | 308 switches::kProfilerTiming, |
310 switches::kProxyServer, | 309 switches::kProxyServer, |
311 switches::kTestingFixedHttpPort, | 310 switches::kTestingFixedHttpPort, |
312 switches::kTestingFixedHttpsPort, | 311 switches::kTestingFixedHttpsPort, |
313 #if defined(OS_MACOSX) | 312 #if defined(OS_MACOSX) |
314 switches::kEnableSandboxLogging, | 313 switches::kEnableSandboxLogging, |
315 #endif | 314 #endif |
316 switches::kUseFakeDeviceForMediaStream, | |
317 switches::kUseFileForFakeVideoCapture, | |
318 }; | 315 }; |
319 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, | 316 cmd_line->CopySwitchesFrom(browser_command_line, kSwitchNames, |
320 arraysize(kSwitchNames)); | 317 arraysize(kSwitchNames)); |
321 | 318 |
322 if (has_cmd_prefix) { | 319 if (has_cmd_prefix) { |
323 // Launch the utility child process with some prefix | 320 // Launch the utility child process with some prefix |
324 // (usually "xterm -e gdb --args"). | 321 // (usually "xterm -e gdb --args"). |
325 cmd_line->PrependWrapper(browser_command_line.GetSwitchValueNative( | 322 cmd_line->PrependWrapper(browser_command_line.GetSwitchValueNative( |
326 switches::kUtilityCmdPrefix)); | 323 switches::kUtilityCmdPrefix)); |
327 } | 324 } |
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
393 base::WeakPtr<UtilityProcessHostImpl> host, | 390 base::WeakPtr<UtilityProcessHostImpl> host, |
394 int error_code) { | 391 int error_code) { |
395 if (!host) | 392 if (!host) |
396 return; | 393 return; |
397 | 394 |
398 host->OnProcessLaunchFailed(error_code); | 395 host->OnProcessLaunchFailed(error_code); |
399 delete host.get(); | 396 delete host.get(); |
400 } | 397 } |
401 | 398 |
402 } // namespace content | 399 } // namespace content |
OLD | NEW |