| 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 80 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 91 #include "content/public/common/main_function_params.h" | 91 #include "content/public/common/main_function_params.h" |
| 92 #include "content/public/common/result_codes.h" | 92 #include "content/public/common/result_codes.h" |
| 93 #include "device/gamepad/gamepad_service.h" | 93 #include "device/gamepad/gamepad_service.h" |
| 94 #include "gpu/vulkan/features.h" | 94 #include "gpu/vulkan/features.h" |
| 95 #include "media/audio/audio_manager.h" | 95 #include "media/audio/audio_manager.h" |
| 96 #include "media/audio/audio_system_impl.h" | 96 #include "media/audio/audio_system_impl.h" |
| 97 #include "media/audio/audio_thread_impl.h" | 97 #include "media/audio/audio_thread_impl.h" |
| 98 #include "media/base/media.h" | 98 #include "media/base/media.h" |
| 99 #include "media/base/user_input_monitor.h" | 99 #include "media/base/user_input_monitor.h" |
| 100 #include "media/midi/midi_service.h" | 100 #include "media/midi/midi_service.h" |
| 101 #include "media/mojo/features.h" |
| 101 #include "mojo/edk/embedder/embedder.h" | 102 #include "mojo/edk/embedder/embedder.h" |
| 102 #include "mojo/edk/embedder/scoped_ipc_support.h" | 103 #include "mojo/edk/embedder/scoped_ipc_support.h" |
| 103 #include "net/base/network_change_notifier.h" | 104 #include "net/base/network_change_notifier.h" |
| 104 #include "net/socket/client_socket_factory.h" | 105 #include "net/socket/client_socket_factory.h" |
| 105 #include "net/ssl/ssl_config_service.h" | 106 #include "net/ssl/ssl_config_service.h" |
| 106 #include "ppapi/features/features.h" | 107 #include "ppapi/features/features.h" |
| 107 #include "services/resource_coordinator/memory/coordinator/coordinator_impl.h" | 108 #include "services/resource_coordinator/memory/coordinator/coordinator_impl.h" |
| 108 #include "services/service_manager/runner/common/client_util.h" | 109 #include "services/service_manager/runner/common/client_util.h" |
| 109 #include "skia/ext/event_tracer_impl.h" | 110 #include "skia/ext/event_tracer_impl.h" |
| 110 #include "skia/ext/skia_memory_dump_provider.h" | 111 #include "skia/ext/skia_memory_dump_provider.h" |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 183 #include "content/browser/zygote_host/zygote_communication_linux.h" | 184 #include "content/browser/zygote_host/zygote_communication_linux.h" |
| 184 #include "content/public/browser/zygote_handle_linux.h" | 185 #include "content/public/browser/zygote_handle_linux.h" |
| 185 #endif // !defined(OS_ANDROID) | 186 #endif // !defined(OS_ANDROID) |
| 186 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) | 187 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) |
| 187 | 188 |
| 188 | 189 |
| 189 #if BUILDFLAG(ENABLE_PLUGINS) | 190 #if BUILDFLAG(ENABLE_PLUGINS) |
| 190 #include "content/browser/plugin_service_impl.h" | 191 #include "content/browser/plugin_service_impl.h" |
| 191 #endif | 192 #endif |
| 192 | 193 |
| 193 #if defined(ENABLE_MOJO_CDM) && BUILDFLAG(ENABLE_PEPPER_CDMS) | 194 #if BUILDFLAG(ENABLE_MOJO_CDM) && BUILDFLAG(ENABLE_PEPPER_CDMS) |
| 194 #include "content/browser/media/cdm_registry_impl.h" | 195 #include "content/browser/media/cdm_registry_impl.h" |
| 195 #endif | 196 #endif |
| 196 | 197 |
| 197 #if defined(USE_X11) | 198 #if defined(USE_X11) |
| 198 #include "gpu/config/gpu_driver_bug_workaround_type.h" | 199 #include "gpu/config/gpu_driver_bug_workaround_type.h" |
| 199 #include "ui/base/x/x11_util_internal.h" // nogncheck | 200 #include "ui/base/x/x11_util_internal.h" // nogncheck |
| 200 #include "ui/gfx/x/x11_connection.h" // nogncheck | 201 #include "ui/gfx/x/x11_connection.h" // nogncheck |
| 201 #include "ui/gfx/x/x11_types.h" // nogncheck | 202 #include "ui/gfx/x/x11_types.h" // nogncheck |
| 202 #endif | 203 #endif |
| 203 | 204 |
| (...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 856 // Prior to any processing happening on the IO thread, we create the | 857 // Prior to any processing happening on the IO thread, we create the |
| 857 // plugin service as it is predominantly used from the IO thread, | 858 // plugin service as it is predominantly used from the IO thread, |
| 858 // but must be created on the main thread. The service ctor is | 859 // but must be created on the main thread. The service ctor is |
| 859 // inexpensive and does not invoke the io_thread() accessor. | 860 // inexpensive and does not invoke the io_thread() accessor. |
| 860 { | 861 { |
| 861 TRACE_EVENT0("startup", "BrowserMainLoop::CreateThreads:PluginService"); | 862 TRACE_EVENT0("startup", "BrowserMainLoop::CreateThreads:PluginService"); |
| 862 PluginService::GetInstance()->Init(); | 863 PluginService::GetInstance()->Init(); |
| 863 } | 864 } |
| 864 #endif | 865 #endif |
| 865 | 866 |
| 866 #if defined(ENABLE_MOJO_CDM) && BUILDFLAG(ENABLE_PEPPER_CDMS) | 867 #if BUILDFLAG(ENABLE_MOJO_CDM) && BUILDFLAG(ENABLE_PEPPER_CDMS) |
| 867 // Prior to any processing happening on the IO thread, we create the | 868 // Prior to any processing happening on the IO thread, we create the |
| 868 // CDM service as it is predominantly used from the IO thread. This must | 869 // CDM service as it is predominantly used from the IO thread. This must |
| 869 // be called on the main thread since it involves file path checks. | 870 // be called on the main thread since it involves file path checks. |
| 870 CdmRegistry::GetInstance()->Init(); | 871 CdmRegistry::GetInstance()->Init(); |
| 871 #endif | 872 #endif |
| 872 | 873 |
| 873 #if defined(OS_MACOSX) | 874 #if defined(OS_MACOSX) |
| 874 // The WindowResizeHelper allows the UI thread to wait on specific renderer | 875 // The WindowResizeHelper allows the UI thread to wait on specific renderer |
| 875 // and GPU messages from the IO thread. Initializing it before the IO thread | 876 // and GPU messages from the IO thread. Initializing it before the IO thread |
| 876 // starts ensures the affected IO thread messages always have somewhere to go. | 877 // starts ensures the affected IO thread messages always have somewhere to go. |
| (...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1779 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), | 1780 BrowserThread::GetTaskRunnerForThread(BrowserThread::FILE), |
| 1780 MediaInternals::GetInstance()); | 1781 MediaInternals::GetInstance()); |
| 1781 } | 1782 } |
| 1782 CHECK(audio_manager_); | 1783 CHECK(audio_manager_); |
| 1783 | 1784 |
| 1784 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); | 1785 audio_system_ = media::AudioSystemImpl::Create(audio_manager_.get()); |
| 1785 CHECK(audio_system_); | 1786 CHECK(audio_system_); |
| 1786 } | 1787 } |
| 1787 | 1788 |
| 1788 } // namespace content | 1789 } // namespace content |
| OLD | NEW |