media/mojo/clients/mojo_decoder_factory.cc - Issue 2419723002: Move services/shell to services/service_manager

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: media/mojo/clients/mojo_decoder_factory.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/clients/mojo_decoder_factory.h ('k') | media/mojo/clients/mojo_decryptor.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright 2016 The Chromium Authors. All rights reserved.	1 // Copyright 2016 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/clients/mojo_decoder_factory.h"	5 #include "media/mojo/clients/mojo_decoder_factory.h"

6	6

7 #include "base/single_thread_task_runner.h"	7 #include "base/single_thread_task_runner.h"

8 #include "media/mojo/clients/mojo_audio_decoder.h"	8 #include "media/mojo/clients/mojo_audio_decoder.h"

9 #include "media/mojo/clients/mojo_video_decoder.h"	9 #include "media/mojo/clients/mojo_video_decoder.h"

10 #include "media/mojo/interfaces/audio_decoder.mojom.h"	10 #include "media/mojo/interfaces/audio_decoder.mojom.h"

11 #include "services/shell/public/cpp/connect.h"	11 #include "services/service_manager/public/cpp/connect.h"

12	12

13 namespace media {	13 namespace media {

14	14

15 MojoDecoderFactory::MojoDecoderFactory(	15 MojoDecoderFactory::MojoDecoderFactory(

16 shell::mojom::InterfaceProvider* interface_provider)	16 shell::mojom::InterfaceProvider* interface_provider)

17 : interface_provider_(interface_provider) {	17 : interface_provider_(interface_provider) {

18 DCHECK(interface_provider_);	18 DCHECK(interface_provider_);

19 }	19 }

20	20

21 MojoDecoderFactory::~MojoDecoderFactory() {}	21 MojoDecoderFactory::~MojoDecoderFactory() {}

(...skipping 18 matching lines...) Expand all Loading...
40 #if defined(ENABLE_MOJO_VIDEO_DECODER)	40 #if defined(ENABLE_MOJO_VIDEO_DECODER)

41 mojom::VideoDecoderPtr remote_decoder;	41 mojom::VideoDecoderPtr remote_decoder;

42 shell::GetInterface<mojom::VideoDecoder>(interface_provider_,	42 shell::GetInterface<mojom::VideoDecoder>(interface_provider_,

43 &remote_decoder);	43 &remote_decoder);

44 video_decoders->push_back(new MojoVideoDecoder(task_runner, gpu_factories,	44 video_decoders->push_back(new MojoVideoDecoder(task_runner, gpu_factories,

45 std::move(remote_decoder)));	45 std::move(remote_decoder)));

46 #endif	46 #endif

47 }	47 }

48	48

49 } // namespace media	49 } // namespace media

OLD	NEW