summaryrefslogtreecommitdiffstats
path: root/mojo
diff options
context:
space:
mode:
authorservolk <servolk@chromium.org>2015-03-03 11:08:18 -0800
committerCommit bot <commit-bot@chromium.org>2015-03-03 19:08:54 +0000
commit8b3b39bc38e111503353d5c5afa37b4b9d091d2e (patch)
treee666c45aa60c46c58866d881339d2d5c366044f4 /mojo
parentbad02d28065cbabb8d79a0804343cd2af93a7a37 (diff)
downloadchromium_src-8b3b39bc38e111503353d5c5afa37b4b9d091d2e.zip
chromium_src-8b3b39bc38e111503353d5c5afa37b4b9d091d2e.tar.gz
chromium_src-8b3b39bc38e111503353d5c5afa37b4b9d091d2e.tar.bz2
Moved gpu factories to media/renderers/
Since DefaultRendererFactory uses GPU factories, code that instantiates the default factory need to include GPU factories headers and need to be able to instantiate them as well, so moving the GPU factories (both the mock and the real one) to media/renderers/ to make deps easier. BUG=457959 Review URL: https://codereview.chromium.org/970023002 Cr-Commit-Position: refs/heads/master@{#318922}
Diffstat (limited to 'mojo')
-rw-r--r--mojo/services/html_viewer/webmediaplayer_factory.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/mojo/services/html_viewer/webmediaplayer_factory.cc b/mojo/services/html_viewer/webmediaplayer_factory.cc
index a5729dd..0b73a98 100644
--- a/mojo/services/html_viewer/webmediaplayer_factory.cc
+++ b/mojo/services/html_viewer/webmediaplayer_factory.cc
@@ -17,10 +17,10 @@
#include "media/blink/webmediaplayer_impl.h"
#include "media/blink/webmediaplayer_params.h"
#include "media/cdm/default_cdm_factory.h"
-#include "media/filters/gpu_video_accelerator_factories.h"
#include "media/mojo/interfaces/media_renderer.mojom.h"
#include "media/mojo/services/mojo_renderer_factory.h"
#include "media/renderers/default_renderer_factory.h"
+#include "media/renderers/gpu_video_accelerator_factories.h"
#include "third_party/mojo/src/mojo/public/cpp/application/connect.h"
#include "third_party/mojo/src/mojo/public/interfaces/application/shell.mojom.h"