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

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

Issue 1565343003: Move mojo/application/public -> mojo/shell/public (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@fetcher
Patch Set: . Created 4 years, 11 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/mojo_renderer_impl.cc ('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 "media/base/cdm_factory.h" 8 #include "media/base/cdm_factory.h"
9 #include "media/base/media_log.h" 9 #include "media/base/media_log.h"
10 #include "media/base/renderer_factory.h" 10 #include "media/base/renderer_factory.h"
11 #include "media/mojo/services/mojo_cdm_service.h" 11 #include "media/mojo/services/mojo_cdm_service.h"
12 #include "media/mojo/services/mojo_media_client.h" 12 #include "media/mojo/services/mojo_media_client.h"
13 #include "media/mojo/services/mojo_renderer_service.h" 13 #include "media/mojo/services/mojo_renderer_service.h"
14 #include "mojo/application/public/cpp/app_lifetime_helper.h" 14 #include "mojo/shell/public/cpp/app_lifetime_helper.h"
15 #include "mojo/application/public/interfaces/service_provider.mojom.h" 15 #include "mojo/shell/public/interfaces/service_provider.mojom.h"
16 16
17 namespace media { 17 namespace media {
18 18
19 ServiceFactoryImpl::ServiceFactoryImpl( 19 ServiceFactoryImpl::ServiceFactoryImpl(
20 mojo::InterfaceRequest<interfaces::ServiceFactory> request, 20 mojo::InterfaceRequest<interfaces::ServiceFactory> request,
21 mojo::ServiceProvider* service_provider, 21 mojo::ServiceProvider* service_provider,
22 scoped_refptr<MediaLog> media_log, 22 scoped_refptr<MediaLog> media_log,
23 scoped_ptr<mojo::AppRefCount> parent_app_refcount, 23 scoped_ptr<mojo::AppRefCount> parent_app_refcount,
24 MojoMediaClient* mojo_media_client) 24 MojoMediaClient* mojo_media_client)
25 : binding_(this, std::move(request)), 25 : binding_(this, std::move(request)),
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
65 return renderer_factory_.get(); 65 return renderer_factory_.get();
66 } 66 }
67 67
68 CdmFactory* ServiceFactoryImpl::GetCdmFactory() { 68 CdmFactory* ServiceFactoryImpl::GetCdmFactory() {
69 if (!cdm_factory_) 69 if (!cdm_factory_)
70 cdm_factory_ = mojo_media_client_->CreateCdmFactory(service_provider_); 70 cdm_factory_ = mojo_media_client_->CreateCdmFactory(service_provider_);
71 return cdm_factory_.get(); 71 return cdm_factory_.get();
72 } 72 }
73 73
74 } // namespace media 74 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/mojo_renderer_impl.cc ('k') | media/test/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698