Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(319)

Side by Side Diff: content/browser/browser_main_loop.cc

Issue 2565853003: media: Rename CdmService to CdmRegistry (Closed)
Patch Set: add missing BUILD.gn entry Created 4 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 172 matching lines...) Expand 10 before | Expand all | Expand 10 after
183 #include "content/public/browser/zygote_handle_linux.h" 183 #include "content/public/browser/zygote_handle_linux.h"
184 #endif // !defined(OS_ANDROID) 184 #endif // !defined(OS_ANDROID)
185 #endif // defined(OS_POSIX) && !defined(OS_MACOSX) 185 #endif // defined(OS_POSIX) && !defined(OS_MACOSX)
186 186
187 187
188 #if BUILDFLAG(ENABLE_PLUGINS) 188 #if BUILDFLAG(ENABLE_PLUGINS)
189 #include "content/browser/plugin_service_impl.h" 189 #include "content/browser/plugin_service_impl.h"
190 #endif 190 #endif
191 191
192 #if defined(ENABLE_MOJO_CDM) && BUILDFLAG(ENABLE_PEPPER_CDMS) 192 #if defined(ENABLE_MOJO_CDM) && BUILDFLAG(ENABLE_PEPPER_CDMS)
193 #include "content/browser/media/cdm_service_impl.h" 193 #include "content/browser/media/cdm_registry_impl.h"
194 #endif 194 #endif
195 195
196 #if defined(USE_X11) 196 #if defined(USE_X11)
197 #include "gpu/config/gpu_driver_bug_workaround_type.h" 197 #include "gpu/config/gpu_driver_bug_workaround_type.h"
198 #include "ui/base/x/x11_util_internal.h" // nogncheck 198 #include "ui/base/x/x11_util_internal.h" // nogncheck
199 #include "ui/gfx/x/x11_connection.h" // nogncheck 199 #include "ui/gfx/x/x11_connection.h" // nogncheck
200 #include "ui/gfx/x/x11_types.h" // nogncheck 200 #include "ui/gfx/x/x11_types.h" // nogncheck
201 #endif 201 #endif
202 202
203 #if defined(USE_NSS_CERTS) 203 #if defined(USE_NSS_CERTS)
(...skipping 643 matching lines...) Expand 10 before | Expand all | Expand 10 after
847 { 847 {
848 TRACE_EVENT0("startup", "BrowserMainLoop::CreateThreads:PluginService"); 848 TRACE_EVENT0("startup", "BrowserMainLoop::CreateThreads:PluginService");
849 PluginService::GetInstance()->Init(); 849 PluginService::GetInstance()->Init();
850 } 850 }
851 #endif 851 #endif
852 852
853 #if defined(ENABLE_MOJO_CDM) && BUILDFLAG(ENABLE_PEPPER_CDMS) 853 #if defined(ENABLE_MOJO_CDM) && BUILDFLAG(ENABLE_PEPPER_CDMS)
854 // Prior to any processing happening on the IO thread, we create the 854 // Prior to any processing happening on the IO thread, we create the
855 // CDM service as it is predominantly used from the IO thread. This must 855 // CDM service as it is predominantly used from the IO thread. This must
856 // be called on the main thread since it involves file path checks. 856 // be called on the main thread since it involves file path checks.
857 CdmService::GetInstance()->Init(); 857 CdmRegistry::GetInstance()->Init();
858 #endif 858 #endif
859 859
860 #if defined(OS_MACOSX) 860 #if defined(OS_MACOSX)
861 // The WindowResizeHelper allows the UI thread to wait on specific renderer 861 // The WindowResizeHelper allows the UI thread to wait on specific renderer
862 // and GPU messages from the IO thread. Initializing it before the IO thread 862 // and GPU messages from the IO thread. Initializing it before the IO thread
863 // starts ensures the affected IO thread messages always have somewhere to go. 863 // starts ensures the affected IO thread messages always have somewhere to go.
864 ui::WindowResizeHelperMac::Get()->Init(base::ThreadTaskRunnerHandle::Get()); 864 ui::WindowResizeHelperMac::Get()->Init(base::ThreadTaskRunnerHandle::Get());
865 #endif 865 #endif
866 866
867 // 1) Need to initialize in-process GpuDataManager before creating threads. 867 // 1) Need to initialize in-process GpuDataManager before creating threads.
(...skipping 833 matching lines...) Expand 10 before | Expand all | Expand 10 after
1701 if (!audio_manager_) { 1701 if (!audio_manager_) {
1702 audio_thread_ = base::MakeUnique<AudioDeviceThread>(); 1702 audio_thread_ = base::MakeUnique<AudioDeviceThread>();
1703 audio_manager_ = media::AudioManager::Create( 1703 audio_manager_ = media::AudioManager::Create(
1704 audio_thread_->GetTaskRunner(), audio_thread_->worker_task_runner(), 1704 audio_thread_->GetTaskRunner(), audio_thread_->worker_task_runner(),
1705 MediaInternals::GetInstance()); 1705 MediaInternals::GetInstance());
1706 } 1706 }
1707 CHECK(audio_manager_); 1707 CHECK(audio_manager_);
1708 } 1708 }
1709 1709
1710 } // namespace content 1710 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698