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

Side by Side Diff: content/gpu/gpu_process_control_impl.cc

Issue 1837143002: media: Pass MediaPermission to MediaDrmBridge Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: More plumbing Created 4 years, 7 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
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 "content/gpu/gpu_process_control_impl.h" 5 #include "content/gpu/gpu_process_control_impl.h"
6 6
7 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) 7 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
8 #include "base/bind.h" 8 #include "base/bind.h"
9 #include "base/bind_helpers.h" 9 #include "base/bind_helpers.h"
10 #include "media/mojo/services/mojo_media_application_factory.h" 10 #include "media/mojo/services/mojo_media_application_factory.h"
11 #endif 11 #endif
12 12
13 namespace content { 13 namespace content {
14 14
15 GpuProcessControlImpl::GpuProcessControlImpl() {} 15 GpuProcessControlImpl::GpuProcessControlImpl(
16 media::MediaPermission* media_permission)
17 : media_permission_(media_permission) {}
16 18
17 GpuProcessControlImpl::~GpuProcessControlImpl() {} 19 GpuProcessControlImpl::~GpuProcessControlImpl() {}
18 20
19 void GpuProcessControlImpl::RegisterApplicationFactories( 21 void GpuProcessControlImpl::RegisterApplicationFactories(
20 ApplicationFactoryMap* factories) { 22 ApplicationFactoryMap* factories) {
21 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) 23 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
24 #if defined(OS_ANDROID)
25 factories->insert(std::make_pair(
26 "mojo:media", base::Bind(&media::CreateAndroidMojoMediaApplication,
27 media_permission_)));
28 #else
22 factories->insert(std::make_pair( 29 factories->insert(std::make_pair(
23 "mojo:media", base::Bind(&media::CreateMojoMediaApplication))); 30 "mojo:media", base::Bind(&media::CreateMojoMediaApplication)));
24 #endif 31 #endif
32 #endif
25 } 33 }
26 34
27 } // namespace content 35 } // namespace content
OLDNEW
« no previous file with comments | « content/gpu/gpu_process_control_impl.h ('k') | content/renderer/media/media_permission_dispatcher.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698