diff options
| author | jbroman <jbroman@chromium.org> | 2016-01-11 08:35:05 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-11 16:36:10 +0000 |
| commit | b73f2587496f89715872bc4b9b9613f582c3cae5 (patch) | |
| tree | 92ff8119d8da97cc76fa0746380ca447d6a87a49 | |
| parent | d28554a567ddb871196a9268c1d76d8a0061370b (diff) | |
| download | chromium_src-b73f2587496f89715872bc4b9b9613f582c3cae5.zip chromium_src-b73f2587496f89715872bc4b9b9613f582c3cae5.tar.gz chromium_src-b73f2587496f89715872bc4b9b9613f582c3cae5.tar.bz2 | |
GN: Fix //content/renderer check failures related to Mojo.
Review URL: https://codereview.chromium.org/1561953004
Cr-Commit-Position: refs/heads/master@{#368600}
| -rw-r--r-- | content/renderer/BUILD.gn | 7 | ||||
| -rw-r--r-- | content/renderer/render_frame_impl.cc | 4 | ||||
| -rw-r--r-- | content/renderer/render_frame_impl.h | 2 |
3 files changed, 9 insertions, 4 deletions
diff --git a/content/renderer/BUILD.gn b/content/renderer/BUILD.gn index 9d16c82..c3234b0 100644 --- a/content/renderer/BUILD.gn +++ b/content/renderer/BUILD.gn @@ -52,10 +52,12 @@ source_set("renderer") { "//gpu", "//gpu/blink", "//gpu/command_buffer/client:gles2_interface", + "//ipc/mojo", "//jingle:jingle_glue", "//media", "//media/blink", "//media/midi", + "//mojo/application/public/cpp", "//mojo/application/public/interfaces", "//mojo/common:url_type_converters", "//mojo/converters/geometry", @@ -215,7 +217,10 @@ source_set("renderer") { } if (enable_mojo_media != "none") { - deps += [ "//media/mojo/services:proxy" ] + deps += [ + "//media/mojo/interfaces", + "//media/mojo/services:proxy", + ] } if (enable_webvr) { diff --git a/content/renderer/render_frame_impl.cc b/content/renderer/render_frame_impl.cc index 9fa5276..03908b3 100644 --- a/content/renderer/render_frame_impl.cc +++ b/content/renderer/render_frame_impl.cc @@ -213,14 +213,14 @@ #endif #if defined(ENABLE_MOJO_MEDIA) -#include "media/mojo/services/mojo_cdm_factory.h" +#include "media/mojo/services/mojo_cdm_factory.h" // nogncheck #include "mojo/application/public/cpp/connect.h" #include "mojo/application/public/interfaces/shell.mojom.h" #include "mojo/public/cpp/bindings/interface_request.h" #endif #if defined(ENABLE_MOJO_MEDIA) && !defined(OS_ANDROID) -#include "media/mojo/services/mojo_renderer_factory.h" +#include "media/mojo/services/mojo_renderer_factory.h" // nogncheck #else #include "media/renderers/default_renderer_factory.h" #endif diff --git a/content/renderer/render_frame_impl.h b/content/renderer/render_frame_impl.h index d072124..a6154c2 100644 --- a/content/renderer/render_frame_impl.h +++ b/content/renderer/render_frame_impl.h @@ -59,7 +59,7 @@ #endif #if defined(ENABLE_MOJO_MEDIA) -#include "media/mojo/interfaces/service_factory.mojom.h" +#include "media/mojo/interfaces/service_factory.mojom.h" // nogncheck #endif class TransportDIB; |