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

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

Issue 2434673002: media: Rename MojoMediaApplication to MediaService (Closed)
Patch Set: media: Rename MojoMediaApplication to MediaService 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
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_service_factory.h" 5 #include "content/gpu/gpu_service_factory.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" // nogncheck 10 #include "media/mojo/services/media_service_factory.h" // nogncheck
11 #endif 11 #endif
12 12
13 namespace content { 13 namespace content {
14 14
15 GpuServiceFactory::GpuServiceFactory() {} 15 GpuServiceFactory::GpuServiceFactory() {}
16 16
17 GpuServiceFactory::~GpuServiceFactory() {} 17 GpuServiceFactory::~GpuServiceFactory() {}
18 18
19 void GpuServiceFactory::RegisterServices(ServiceMap* services) { 19 void GpuServiceFactory::RegisterServices(ServiceMap* services) {
20 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS) 20 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
21 ServiceInfo info; 21 ServiceInfo info;
22 info.factory = base::Bind(&media::CreateMojoMediaApplication); 22 info.factory = base::Bind(&media::CreateMediaService);
23 info.use_own_thread = true; 23 info.use_own_thread = true;
24 services->insert(std::make_pair("service:media", info)); 24 services->insert(std::make_pair("service:media", info));
25 #endif 25 #endif
26 } 26 }
27 27
28 } // namespace content 28 } // namespace content
OLDNEW
« no previous file with comments | « chromecast/browser/cast_content_browser_client.cc ('k') | content/shell/browser/shell_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698