summaryrefslogtreecommitdiffstats
path: root/mojo/examples/compositor_app
diff options
context:
space:
mode:
authordarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-27 22:07:43 +0000
committerdarin@chromium.org <darin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-02-27 22:07:43 +0000
commita4b0f408ac92589d244e6d0ca05309865c5ec5aa (patch)
tree571bf91e0cb5a3a378f79067b3c16a787a7f539d /mojo/examples/compositor_app
parent16dcbb6a94d4d5ac8d1f0761718de38a0eeacd0b (diff)
downloadchromium_src-a4b0f408ac92589d244e6d0ca05309865c5ec5aa.zip
chromium_src-a4b0f408ac92589d244e6d0ca05309865c5ec5aa.tar.gz
chromium_src-a4b0f408ac92589d244e6d0ca05309865c5ec5aa.tar.bz2
Mojo: Include "path/to/foo.mojom.h"
Given path/to/foo.mojom, change the code generator to output: <(SHARED_INTERMEDIATE_DIR)/path/to/foo.mojom.cc <(SHARED_INTERMEDIATE_DIR)/path/to/foo.mojom.h <(SHARED_INTERMEDIATE_DIR)/path/to/foo.mojom-internal.h This involves shelling out to a python script to compute "path/to" part as that is not otherwise available from GYP. See build/inverse_depth.py. DEPTH is now passed to mojom_bindings_generator.py so that it can similarly compute "path/to". With that, we no longer need the include_dir argument, so I dropped it. R=davemoore@chromium.org, mark@chromium.org Review URL: https://codereview.chromium.org/177183002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253937 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/examples/compositor_app')
-rw-r--r--mojo/examples/compositor_app/compositor_app.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/mojo/examples/compositor_app/compositor_app.cc b/mojo/examples/compositor_app/compositor_app.cc
index 05ffa71..468ffa5 100644
--- a/mojo/examples/compositor_app/compositor_app.cc
+++ b/mojo/examples/compositor_app/compositor_app.cc
@@ -11,11 +11,11 @@
#include "mojo/public/bindings/remote_ptr.h"
#include "mojo/public/gles2/gles2_cpp.h"
#include "mojo/public/shell/application.h"
+#include "mojo/public/shell/shell.mojom.h"
#include "mojo/public/system/core.h"
#include "mojo/public/system/macros.h"
#include "mojo/services/native_viewport/geometry_conversions.h"
-#include "mojom/native_viewport.h"
-#include "mojom/shell.h"
+#include "mojo/services/native_viewport/native_viewport.mojom.h"
#include "ui/gfx/rect.h"
#if defined(WIN32)