| 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 160 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 171 #if defined(OS_POSIX) && !defined(OS_MACOSX) | 171 #if defined(OS_POSIX) && !defined(OS_MACOSX) |
| 172 #include "content/browser/renderer_host/render_sandbox_host_linux.h" | 172 #include "content/browser/renderer_host/render_sandbox_host_linux.h" |
| 173 #include "content/browser/zygote_host/zygote_host_impl_linux.h" | 173 #include "content/browser/zygote_host/zygote_host_impl_linux.h" |
| 174 | 174 |
| 175 #if !defined(OS_ANDROID) | 175 #if !defined(OS_ANDROID) |
| 176 #include "content/public/browser/zygote_handle_linux.h" | 176 #include "content/public/browser/zygote_handle_linux.h" |
| 177 #endif // !defined(OS_ANDROID) | 177 #endif // !defined(OS_ANDROID) |
| 178 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) | 178 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) |
| 179 | 179 |
| 180 | 180 |
| 181 #if defined(ENABLE_PLUGINS) | 181 #if BUILDFLAG(ENABLE_PLUGINS) |
| 182 #include "content/browser/plugin_service_impl.h" | 182 #include "content/browser/plugin_service_impl.h" |
| 183 #endif | 183 #endif |
| 184 | 184 |
| 185 #if defined(ENABLE_MOJO_CDM) && BUILDFLAG(ENABLE_PEPPER_CDMS) | 185 #if defined(ENABLE_MOJO_CDM) && BUILDFLAG(ENABLE_PEPPER_CDMS) |
| 186 #include "content/browser/media/cdm_service_impl.h" | 186 #include "content/browser/media/cdm_service_impl.h" |
| 187 #endif | 187 #endif |
| 188 | 188 |
| 189 #if defined(USE_X11) | 189 #if defined(USE_X11) |
| 190 #include "gpu/config/gpu_driver_bug_workaround_type.h" | 190 #include "gpu/config/gpu_driver_bug_workaround_type.h" |
| 191 #include "ui/base/x/x11_util_internal.h" // nogncheck | 191 #include "ui/base/x/x11_util_internal.h" // nogncheck |
| (...skipping 556 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 748 // the second time. | 748 // the second time. |
| 749 base::FeatureList::InitializeInstance( | 749 base::FeatureList::InitializeInstance( |
| 750 command_line->GetSwitchValueASCII(switches::kEnableFeatures), | 750 command_line->GetSwitchValueASCII(switches::kEnableFeatures), |
| 751 command_line->GetSwitchValueASCII(switches::kDisableFeatures)); | 751 command_line->GetSwitchValueASCII(switches::kDisableFeatures)); |
| 752 | 752 |
| 753 InitializeMemoryManagementComponent(); | 753 InitializeMemoryManagementComponent(); |
| 754 | 754 |
| 755 if (base::FeatureList::IsEnabled(features::kMemoryCoordinator)) | 755 if (base::FeatureList::IsEnabled(features::kMemoryCoordinator)) |
| 756 MemoryCoordinator::GetInstance()->Start(); | 756 MemoryCoordinator::GetInstance()->Start(); |
| 757 | 757 |
| 758 #if defined(ENABLE_PLUGINS) | 758 #if BUILDFLAG(ENABLE_PLUGINS) |
| 759 // Prior to any processing happening on the IO thread, we create the | 759 // Prior to any processing happening on the IO thread, we create the |
| 760 // plugin service as it is predominantly used from the IO thread, | 760 // plugin service as it is predominantly used from the IO thread, |
| 761 // but must be created on the main thread. The service ctor is | 761 // but must be created on the main thread. The service ctor is |
| 762 // inexpensive and does not invoke the io_thread() accessor. | 762 // inexpensive and does not invoke the io_thread() accessor. |
| 763 { | 763 { |
| 764 TRACE_EVENT0("startup", "BrowserMainLoop::CreateThreads:PluginService"); | 764 TRACE_EVENT0("startup", "BrowserMainLoop::CreateThreads:PluginService"); |
| 765 PluginService::GetInstance()->Init(); | 765 PluginService::GetInstance()->Init(); |
| 766 } | 766 } |
| 767 #endif | 767 #endif |
| 768 | 768 |
| (...skipping 837 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1606 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = | 1606 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = |
| 1607 audio_thread_->task_runner(); | 1607 audio_thread_->task_runner(); |
| 1608 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), | 1608 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), |
| 1609 std::move(worker_task_runner), | 1609 std::move(worker_task_runner), |
| 1610 MediaInternals::GetInstance()); | 1610 MediaInternals::GetInstance()); |
| 1611 } | 1611 } |
| 1612 CHECK(audio_manager_); | 1612 CHECK(audio_manager_); |
| 1613 } | 1613 } |
| 1614 | 1614 |
| 1615 } // namespace content | 1615 } // namespace content |
| OLD | NEW |