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

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

Issue 1320453003: media: Support MojoMediaApplication in GPU process. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Add missing import Created 5 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 | « content/gpu/DEPS ('k') | content/utility/utility_process_control_impl.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 "content/gpu/gpu_process_control_impl.h" 5 #include "content/gpu/gpu_process_control_impl.h"
6 6
7 #include "base/logging.h" 7 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
8 #include "base/bind.h"
9 #include "base/bind_helpers.h"
10 #include "media/mojo/services/mojo_media_application.h"
11 #include "mojo/shell/static_application_loader.h"
12 #endif
8 13
9 namespace content { 14 namespace content {
10 15
11 GpuProcessControlImpl::GpuProcessControlImpl() {} 16 GpuProcessControlImpl::GpuProcessControlImpl() {}
12 17
13 GpuProcessControlImpl::~GpuProcessControlImpl() {} 18 GpuProcessControlImpl::~GpuProcessControlImpl() {}
14 19
15 void GpuProcessControlImpl::RegisterApplicationLoaders( 20 void GpuProcessControlImpl::RegisterApplicationLoaders(
16 URLToLoaderMap* url_to_loader_map) { 21 URLToLoaderMap* url_to_loader_map) {
17 // TODO(xhwang): Support MojoMediaApplication here. 22 #if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
18 // See http://crbug.com/521755 23 (*url_to_loader_map)[GURL("mojo:media")] =
19 NOTIMPLEMENTED(); 24 new mojo::shell::StaticApplicationLoader(
25 base::Bind(&media::MojoMediaApplication::CreateApp),
26 base::Bind(&base::DoNothing));
27 #endif
20 } 28 }
21 29
22 } // namespace content 30 } // namespace content
OLDNEW
« no previous file with comments | « content/gpu/DEPS ('k') | content/utility/utility_process_control_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698