diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 00:53:27 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-28 00:53:27 +0000 |
| commit | 5dddd197efdfc27a7f7701f2f9b5965aa68b771e (patch) | |
| tree | c5ac6281af8bdad4f2460a139903ae533e804a85 /mojo/examples/compositor_app | |
| parent | d232ef502b92b99c405fff9b0ecf9cccd2813398 (diff) | |
| download | chromium_src-5dddd197efdfc27a7f7701f2f9b5965aa68b771e.zip chromium_src-5dddd197efdfc27a7f7701f2f9b5965aa68b771e.tar.gz chromium_src-5dddd197efdfc27a7f7701f2f9b5965aa68b771e.tar.bz2 | |
Mojo: Move mojo/public/system/core_cpp.h to mojo/cpp/public/system/core.h.
Also begin rearranging tests. (I'm deferring moving macros_unittest.cc
until after I split macros.h.)
R=darin@chromium.org
Review URL: https://codereview.chromium.org/214753004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260048 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/examples/compositor_app')
| -rw-r--r-- | mojo/examples/compositor_app/compositor_host.h | 2 | ||||
| -rw-r--r-- | mojo/examples/compositor_app/mojo_context_provider.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mojo/examples/compositor_app/compositor_host.h b/mojo/examples/compositor_app/compositor_host.h index 97f5b14..5bbe71d 100644 --- a/mojo/examples/compositor_app/compositor_host.h +++ b/mojo/examples/compositor_app/compositor_host.h @@ -9,7 +9,7 @@ #include "base/memory/scoped_ptr.h" #include "base/threading/thread.h" #include "cc/trees/layer_tree_host_client.h" -#include "mojo/public/system/core_cpp.h" +#include "mojo/public/cpp/system/core.h" #include "ui/gfx/size.h" namespace cc { diff --git a/mojo/examples/compositor_app/mojo_context_provider.h b/mojo/examples/compositor_app/mojo_context_provider.h index 884470a..4f2cc15 100644 --- a/mojo/examples/compositor_app/mojo_context_provider.h +++ b/mojo/examples/compositor_app/mojo_context_provider.h @@ -3,8 +3,8 @@ // found in the LICENSE file. #include "cc/output/context_provider.h" +#include "mojo/public/cpp/system/core.h" #include "mojo/public/gles2/gles2.h" -#include "mojo/public/system/core_cpp.h" namespace mojo { namespace examples { |