summaryrefslogtreecommitdiffstats
path: root/mojo/examples/aura_demo
diff options
context:
space:
mode:
authorviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-28 13:23:23 +0000
committerviettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-28 13:23:23 +0000
commit2fb8c53c9df2604b691f754f2e9f678a2d093221 (patch)
tree4c2da06e5dd4e4e04e3b15b9a94ee0f707b5793f /mojo/examples/aura_demo
parent992d2c81e7f412fb652de4f4cbd5a8aac5d56cd7 (diff)
downloadchromium_src-2fb8c53c9df2604b691f754f2e9f678a2d093221.zip
chromium_src-2fb8c53c9df2604b691f754f2e9f678a2d093221.tar.gz
chromium_src-2fb8c53c9df2604b691f754f2e9f678a2d093221.tar.bz2
Mojo: Split off the C++ parts of mojo/public/c/system macros.h to their own file.
(Also split the tests.) R=darin@chromium.org Review URL: https://codereview.chromium.org/216073002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260114 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/examples/aura_demo')
-rw-r--r--mojo/examples/aura_demo/aura_demo.cc3
1 files changed, 1 insertions, 2 deletions
diff --git a/mojo/examples/aura_demo/aura_demo.cc b/mojo/examples/aura_demo/aura_demo.cc
index be9b144..0b5391d 100644
--- a/mojo/examples/aura_demo/aura_demo.cc
+++ b/mojo/examples/aura_demo/aura_demo.cc
@@ -11,8 +11,7 @@
#include "mojo/examples/aura_demo/demo_screen.h"
#include "mojo/examples/aura_demo/window_tree_host_mojo.h"
#include "mojo/public/bindings/allocation_scope.h"
-#include "mojo/public/c/system/core.h"
-#include "mojo/public/c/system/macros.h"
+#include "mojo/public/cpp/system/core.h"
#include "mojo/public/gles2/gles2_cpp.h"
#include "mojo/public/shell/application.h"
#include "mojo/public/shell/shell.mojom.h"