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

Unified 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: rebase only 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/gpu/DEPS ('k') | content/utility/utility_process_control_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/gpu/gpu_process_control_impl.cc
diff --git a/content/gpu/gpu_process_control_impl.cc b/content/gpu/gpu_process_control_impl.cc
index c087c8319fe582fed151d6990f4552324924d49a..cb3175b8bfc0bbd0272744fa8e289428f946b451 100644
--- a/content/gpu/gpu_process_control_impl.cc
+++ b/content/gpu/gpu_process_control_impl.cc
@@ -4,7 +4,12 @@
#include "content/gpu/gpu_process_control_impl.h"
-#include "base/logging.h"
+#if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
+#include "base/bind.h"
+#include "base/bind_helpers.h"
+#include "media/mojo/services/mojo_media_application.h"
+#include "mojo/shell/static_application_loader.h"
+#endif
namespace content {
@@ -14,9 +19,12 @@ GpuProcessControlImpl::~GpuProcessControlImpl() {}
void GpuProcessControlImpl::RegisterApplicationLoaders(
URLToLoaderMap* url_to_loader_map) {
- // TODO(xhwang): Support MojoMediaApplication here.
- // See http://crbug.com/521755
- NOTIMPLEMENTED();
+#if defined(ENABLE_MOJO_MEDIA_IN_GPU_PROCESS)
+ (*url_to_loader_map)[GURL("mojo:media")] =
piman 2015/10/10 00:33:08 nit: I see "mojo:media" is used in a lot of places
xhwang 2015/10/12 18:05:02 That is what I did in the old code. But it seems i
+ new mojo::shell::StaticApplicationLoader(
+ base::Bind(&media::MojoMediaApplication::CreateApp),
+ base::Bind(&base::DoNothing));
+#endif
}
} // namespace content
« 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