Chromium Code Reviews| 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/browser_main_loop.h" | 5 #include "content/browser/browser_main_loop.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 189 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 200 #ifdef DestroyAll | 200 #ifdef DestroyAll |
| 201 #undef DestroyAll | 201 #undef DestroyAll |
| 202 #endif | 202 #endif |
| 203 | 203 |
| 204 namespace content { | 204 namespace content { |
| 205 namespace { | 205 namespace { |
| 206 | 206 |
| 207 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) | 207 #if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID) |
| 208 void SetupSandbox(const base::CommandLine& parsed_command_line) { | 208 void SetupSandbox(const base::CommandLine& parsed_command_line) { |
| 209 TRACE_EVENT0("startup", "SetupSandbox"); | 209 TRACE_EVENT0("startup", "SetupSandbox"); |
| 210 if (parsed_command_line.HasSwitch(switches::kNoZygote)) { | |
| 211 DCHECK(parsed_command_line.HasSwitch(switches::kNoSandbox)); | |
|
rickyz (no longer on Chrome)
2016/10/04 20:00:32
Let's upgrade this to a CHECK with an error messag
Sami
2016/10/05 13:15:16
Done.
| |
| 212 return; | |
| 213 } | |
| 210 | 214 |
| 211 // Tickle the sandbox host and zygote host so they fork now. | 215 // Tickle the sandbox host and zygote host so they fork now. |
| 212 RenderSandboxHostLinux::GetInstance()->Init(); | 216 RenderSandboxHostLinux::GetInstance()->Init(); |
| 213 ZygoteHostImpl::GetInstance()->Init(parsed_command_line); | 217 ZygoteHostImpl::GetInstance()->Init(parsed_command_line); |
| 214 *GetGenericZygote() = CreateZygote(); | 218 *GetGenericZygote() = CreateZygote(); |
| 215 RenderProcessHostImpl::EarlyZygoteLaunch(); | 219 RenderProcessHostImpl::EarlyZygoteLaunch(); |
| 216 } | 220 } |
| 217 #endif | 221 #endif |
| 218 | 222 |
| 219 #if defined(USE_GLIB) | 223 #if defined(USE_GLIB) |
| (...skipping 1344 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1564 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = | 1568 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = |
| 1565 audio_thread_->task_runner(); | 1569 audio_thread_->task_runner(); |
| 1566 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), | 1570 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), |
| 1567 std::move(worker_task_runner), | 1571 std::move(worker_task_runner), |
| 1568 MediaInternals::GetInstance()); | 1572 MediaInternals::GetInstance()); |
| 1569 } | 1573 } |
| 1570 CHECK(audio_manager_); | 1574 CHECK(audio_manager_); |
| 1571 } | 1575 } |
| 1572 | 1576 |
| 1573 } // namespace content | 1577 } // namespace content |
| OLD | NEW |