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

Side by Side Diff: media/mojo/services/service_factory_impl.cc

Issue 2419723002: Move services/shell to services/service_manager (Closed)
Patch Set: rebase Created 4 years, 2 months 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
« no previous file with comments | « media/mojo/services/service_factory_impl.h ('k') | media/test/BUILD.gn » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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 "media/mojo/services/service_factory_impl.h" 5 #include "media/mojo/services/service_factory_impl.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/threading/thread_task_runner_handle.h" 8 #include "base/threading/thread_task_runner_handle.h"
9 #include "media/base/media_log.h" 9 #include "media/base/media_log.h"
10 #include "media/mojo/services/mojo_media_client.h" 10 #include "media/mojo/services/mojo_media_client.h"
11 #include "mojo/public/cpp/bindings/strong_binding.h" 11 #include "mojo/public/cpp/bindings/strong_binding.h"
12 #include "services/shell/public/interfaces/interface_provider.mojom.h" 12 #include "services/service_manager/public/interfaces/interface_provider.mojom.h"
13 13
14 #if defined(ENABLE_MOJO_AUDIO_DECODER) 14 #if defined(ENABLE_MOJO_AUDIO_DECODER)
15 #include "media/mojo/services/mojo_audio_decoder_service.h" 15 #include "media/mojo/services/mojo_audio_decoder_service.h"
16 #endif // defined(ENABLE_MOJO_AUDIO_DECODER) 16 #endif // defined(ENABLE_MOJO_AUDIO_DECODER)
17 17
18 #if defined(ENABLE_MOJO_VIDEO_DECODER) 18 #if defined(ENABLE_MOJO_VIDEO_DECODER)
19 #include "media/mojo/services/mojo_video_decoder_service.h" 19 #include "media/mojo/services/mojo_video_decoder_service.h"
20 #endif // defined(ENABLE_MOJO_VIDEO_DECODER) 20 #endif // defined(ENABLE_MOJO_VIDEO_DECODER)
21 21
22 #if defined(ENABLE_MOJO_RENDERER) 22 #if defined(ENABLE_MOJO_RENDERER)
(...skipping 116 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 CdmFactory* ServiceFactoryImpl::GetCdmFactory() { 139 CdmFactory* ServiceFactoryImpl::GetCdmFactory() {
140 if (!cdm_factory_) { 140 if (!cdm_factory_) {
141 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_.get()); 141 cdm_factory_ = mojo_media_client_->CreateCdmFactory(interfaces_.get());
142 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available."; 142 LOG_IF(ERROR, !cdm_factory_) << "CdmFactory not available.";
143 } 143 }
144 return cdm_factory_.get(); 144 return cdm_factory_.get();
145 } 145 }
146 #endif // defined(ENABLE_MOJO_CDM) 146 #endif // defined(ENABLE_MOJO_CDM)
147 147
148 } // namespace media 148 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/service_factory_impl.h ('k') | media/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698