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

Side by Side Diff: media/mojo/services/android_mojo_media_client.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/BUILD.gn ('k') | media/mojo/services/main.cc » ('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/android_mojo_media_client.h" 5 #include "media/mojo/services/android_mojo_media_client.h"
6 6
7 #include "base/memory/ptr_util.h" 7 #include "base/memory/ptr_util.h"
8 #include "media/base/android/android_cdm_factory.h" 8 #include "media/base/android/android_cdm_factory.h"
9 #include "media/base/audio_decoder.h" 9 #include "media/base/audio_decoder.h"
10 #include "media/base/cdm_factory.h" 10 #include "media/base/cdm_factory.h"
11 #include "media/filters/android/media_codec_audio_decoder.h" 11 #include "media/filters/android/media_codec_audio_decoder.h"
12 #include "media/mojo/interfaces/provision_fetcher.mojom.h" 12 #include "media/mojo/interfaces/provision_fetcher.mojom.h"
13 #include "media/mojo/services/mojo_provision_fetcher.h" 13 #include "media/mojo/services/mojo_provision_fetcher.h"
14 #include "services/shell/public/cpp/connect.h" 14 #include "services/service_manager/public/cpp/connect.h"
15 15
16 namespace media { 16 namespace media {
17 17
18 namespace { 18 namespace {
19 19
20 std::unique_ptr<ProvisionFetcher> CreateProvisionFetcher( 20 std::unique_ptr<ProvisionFetcher> CreateProvisionFetcher(
21 shell::mojom::InterfaceProvider* interface_provider) { 21 shell::mojom::InterfaceProvider* interface_provider) {
22 mojom::ProvisionFetcherPtr provision_fetcher_ptr; 22 mojom::ProvisionFetcherPtr provision_fetcher_ptr;
23 shell::GetInterface(interface_provider, &provision_fetcher_ptr); 23 shell::GetInterface(interface_provider, &provision_fetcher_ptr);
24 return base::MakeUnique<MojoProvisionFetcher>( 24 return base::MakeUnique<MojoProvisionFetcher>(
(...skipping 13 matching lines...) Expand all
38 return base::MakeUnique<MediaCodecAudioDecoder>(task_runner); 38 return base::MakeUnique<MediaCodecAudioDecoder>(task_runner);
39 } 39 }
40 40
41 std::unique_ptr<CdmFactory> AndroidMojoMediaClient::CreateCdmFactory( 41 std::unique_ptr<CdmFactory> AndroidMojoMediaClient::CreateCdmFactory(
42 shell::mojom::InterfaceProvider* interface_provider) { 42 shell::mojom::InterfaceProvider* interface_provider) {
43 return base::MakeUnique<AndroidCdmFactory>( 43 return base::MakeUnique<AndroidCdmFactory>(
44 base::Bind(&CreateProvisionFetcher, interface_provider)); 44 base::Bind(&CreateProvisionFetcher, interface_provider));
45 } 45 }
46 46
47 } // namespace media 47 } // namespace media
OLDNEW
« no previous file with comments | « media/mojo/services/BUILD.gn ('k') | media/mojo/services/main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698