| 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 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 #include "device/battery/battery_status_service.h" | 81 #include "device/battery/battery_status_service.h" |
| 82 #include "device/time_zone_monitor/time_zone_monitor.h" | 82 #include "device/time_zone_monitor/time_zone_monitor.h" |
| 83 #include "media/base/media.h" | 83 #include "media/base/media.h" |
| 84 #include "media/base/user_input_monitor.h" | 84 #include "media/base/user_input_monitor.h" |
| 85 #include "media/midi/midi_manager.h" | 85 #include "media/midi/midi_manager.h" |
| 86 #include "mojo/edk/embedder/embedder.h" | 86 #include "mojo/edk/embedder/embedder.h" |
| 87 #include "mojo/edk/embedder/scoped_ipc_support.h" | 87 #include "mojo/edk/embedder/scoped_ipc_support.h" |
| 88 #include "net/base/network_change_notifier.h" | 88 #include "net/base/network_change_notifier.h" |
| 89 #include "net/socket/client_socket_factory.h" | 89 #include "net/socket/client_socket_factory.h" |
| 90 #include "net/ssl/ssl_config_service.h" | 90 #include "net/ssl/ssl_config_service.h" |
| 91 #include "ppapi/features/features.h" |
| 91 #include "services/shell/runner/common/client_util.h" | 92 #include "services/shell/runner/common/client_util.h" |
| 92 #include "skia/ext/event_tracer_impl.h" | 93 #include "skia/ext/event_tracer_impl.h" |
| 93 #include "skia/ext/skia_memory_dump_provider.h" | 94 #include "skia/ext/skia_memory_dump_provider.h" |
| 94 #include "sql/sql_memory_dump_provider.h" | 95 #include "sql/sql_memory_dump_provider.h" |
| 95 #include "ui/base/clipboard/clipboard.h" | 96 #include "ui/base/clipboard/clipboard.h" |
| 96 | 97 |
| 97 #if defined(USE_AURA) || defined(OS_MACOSX) | 98 #if defined(USE_AURA) || defined(OS_MACOSX) |
| 98 #include "content/browser/compositor/image_transport_factory.h" | 99 #include "content/browser/compositor/image_transport_factory.h" |
| 99 #endif | 100 #endif |
| 100 | 101 |
| (...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 170 #if !defined(OS_ANDROID) | 171 #if !defined(OS_ANDROID) |
| 171 #include "content/public/browser/zygote_handle_linux.h" | 172 #include "content/public/browser/zygote_handle_linux.h" |
| 172 #endif // !defined(OS_ANDROID) | 173 #endif // !defined(OS_ANDROID) |
| 173 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) | 174 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) |
| 174 | 175 |
| 175 | 176 |
| 176 #if defined(ENABLE_PLUGINS) | 177 #if defined(ENABLE_PLUGINS) |
| 177 #include "content/browser/plugin_service_impl.h" | 178 #include "content/browser/plugin_service_impl.h" |
| 178 #endif | 179 #endif |
| 179 | 180 |
| 180 #if defined(ENABLE_MOJO_CDM) && defined(ENABLE_PEPPER_CDMS) | 181 #if defined(ENABLE_MOJO_CDM) && BUILDFLAG(ENABLE_PEPPER_CDMS) |
| 181 #include "content/browser/media/cdm_service_impl.h" | 182 #include "content/browser/media/cdm_service_impl.h" |
| 182 #endif | 183 #endif |
| 183 | 184 |
| 184 #if defined(USE_X11) | 185 #if defined(USE_X11) |
| 185 #include "gpu/config/gpu_driver_bug_workaround_type.h" | 186 #include "gpu/config/gpu_driver_bug_workaround_type.h" |
| 186 #include "ui/base/x/x11_util_internal.h" // nogncheck | 187 #include "ui/base/x/x11_util_internal.h" // nogncheck |
| 187 #include "ui/gfx/x/x11_connection.h" // nogncheck | 188 #include "ui/gfx/x/x11_connection.h" // nogncheck |
| 188 #include "ui/gfx/x/x11_types.h" // nogncheck | 189 #include "ui/gfx/x/x11_types.h" // nogncheck |
| 189 #endif | 190 #endif |
| 190 | 191 |
| (...skipping 572 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 763 // Prior to any processing happening on the IO thread, we create the | 764 // Prior to any processing happening on the IO thread, we create the |
| 764 // plugin service as it is predominantly used from the IO thread, | 765 // plugin service as it is predominantly used from the IO thread, |
| 765 // but must be created on the main thread. The service ctor is | 766 // but must be created on the main thread. The service ctor is |
| 766 // inexpensive and does not invoke the io_thread() accessor. | 767 // inexpensive and does not invoke the io_thread() accessor. |
| 767 { | 768 { |
| 768 TRACE_EVENT0("startup", "BrowserMainLoop::CreateThreads:PluginService"); | 769 TRACE_EVENT0("startup", "BrowserMainLoop::CreateThreads:PluginService"); |
| 769 PluginService::GetInstance()->Init(); | 770 PluginService::GetInstance()->Init(); |
| 770 } | 771 } |
| 771 #endif | 772 #endif |
| 772 | 773 |
| 773 #if defined(ENABLE_MOJO_CDM) && defined(ENABLE_PEPPER_CDMS) | 774 #if defined(ENABLE_MOJO_CDM) && BUILDFLAG(ENABLE_PEPPER_CDMS) |
| 774 // Prior to any processing happening on the IO thread, we create the | 775 // Prior to any processing happening on the IO thread, we create the |
| 775 // CDM service as it is predominantly used from the IO thread. This must | 776 // CDM service as it is predominantly used from the IO thread. This must |
| 776 // be called on the main thread since it involves file path checks. | 777 // be called on the main thread since it involves file path checks. |
| 777 CdmService::GetInstance()->Init(); | 778 CdmService::GetInstance()->Init(); |
| 778 #endif | 779 #endif |
| 779 | 780 |
| 780 #if defined(OS_MACOSX) | 781 #if defined(OS_MACOSX) |
| 781 // The WindowResizeHelper allows the UI thread to wait on specific renderer | 782 // The WindowResizeHelper allows the UI thread to wait on specific renderer |
| 782 // and GPU messages from the IO thread. Initializing it before the IO thread | 783 // and GPU messages from the IO thread. Initializing it before the IO thread |
| 783 // starts ensures the affected IO thread messages always have somewhere to go. | 784 // starts ensures the affected IO thread messages always have somewhere to go. |
| (...skipping 786 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1570 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = | 1571 scoped_refptr<base::SingleThreadTaskRunner> worker_task_runner = |
| 1571 audio_thread_->task_runner(); | 1572 audio_thread_->task_runner(); |
| 1572 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), | 1573 audio_manager_ = media::AudioManager::Create(std::move(audio_task_runner), |
| 1573 std::move(worker_task_runner), | 1574 std::move(worker_task_runner), |
| 1574 MediaInternals::GetInstance()); | 1575 MediaInternals::GetInstance()); |
| 1575 } | 1576 } |
| 1576 CHECK(audio_manager_); | 1577 CHECK(audio_manager_); |
| 1577 } | 1578 } |
| 1578 | 1579 |
| 1579 } // namespace content | 1580 } // namespace content |
| OLD | NEW |