diff options
| -rw-r--r-- | mojo/apps/js/main.cc | 2 | ||||
| -rw-r--r-- | mojo/examples/aura_demo/aura_demo.cc | 2 | ||||
| -rw-r--r-- | mojo/examples/compositor_app/compositor_app.cc | 2 | ||||
| -rw-r--r-- | mojo/examples/launcher/launcher.cc | 2 | ||||
| -rw-r--r-- | mojo/examples/pepper_container_app/pepper_container_app.cc | 2 | ||||
| -rw-r--r-- | mojo/examples/sample_app/sample_app.cc | 2 | ||||
| -rw-r--r-- | mojo/public/cpp/gles2/DEPS | 4 | ||||
| -rw-r--r-- | mojo/public/cpp/gles2/gles2.h (renamed from mojo/public/gles2/gles2_cpp.h) | 6 | ||||
| -rw-r--r-- | mojo/public/gles2/gles2_interface.h | 2 |
9 files changed, 14 insertions, 10 deletions
diff --git a/mojo/apps/js/main.cc b/mojo/apps/js/main.cc index a712c2a..394e9c6 100644 --- a/mojo/apps/js/main.cc +++ b/mojo/apps/js/main.cc @@ -5,9 +5,9 @@ #include "base/message_loop/message_loop.h" #include "gin/public/isolate_holder.h" #include "mojo/apps/js/mojo_runner_delegate.h" +#include "mojo/public/cpp/gles2/gles2.h" #include "mojo/public/cpp/system/core.h" #include "mojo/public/cpp/system/macros.h" -#include "mojo/public/gles2/gles2_cpp.h" #if defined(WIN32) #if !defined(CDECL) diff --git a/mojo/examples/aura_demo/aura_demo.cc b/mojo/examples/aura_demo/aura_demo.cc index 0b5391d..80b68aa 100644 --- a/mojo/examples/aura_demo/aura_demo.cc +++ b/mojo/examples/aura_demo/aura_demo.cc @@ -11,8 +11,8 @@ #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/cpp/gles2/gles2.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" #include "mojo/services/native_viewport/native_viewport.mojom.h" diff --git a/mojo/examples/compositor_app/compositor_app.cc b/mojo/examples/compositor_app/compositor_app.cc index 75ca06f..56a74c5 100644 --- a/mojo/examples/compositor_app/compositor_app.cc +++ b/mojo/examples/compositor_app/compositor_app.cc @@ -10,8 +10,8 @@ #include "mojo/examples/compositor_app/compositor_host.h" #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/bindings/remote_ptr.h" +#include "mojo/public/cpp/gles2/gles2.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" #include "mojo/services/native_viewport/geometry_conversions.h" diff --git a/mojo/examples/launcher/launcher.cc b/mojo/examples/launcher/launcher.cc index 310d526..34067df 100644 --- a/mojo/examples/launcher/launcher.cc +++ b/mojo/examples/launcher/launcher.cc @@ -17,8 +17,8 @@ #include "mojo/examples/launcher/launcher.mojom.h" #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/bindings/remote_ptr.h" +#include "mojo/public/cpp/gles2/gles2.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" #include "mojo/services/native_viewport/native_viewport.mojom.h" diff --git a/mojo/examples/pepper_container_app/pepper_container_app.cc b/mojo/examples/pepper_container_app/pepper_container_app.cc index ec45a45c..6da28e9 100644 --- a/mojo/examples/pepper_container_app/pepper_container_app.cc +++ b/mojo/examples/pepper_container_app/pepper_container_app.cc @@ -14,8 +14,8 @@ #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/bindings/remote_ptr.h" #include "mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/gles2/gles2.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" #include "mojo/services/native_viewport/native_viewport.mojom.h" diff --git a/mojo/examples/sample_app/sample_app.cc b/mojo/examples/sample_app/sample_app.cc index 66e9df4..38e58aaa 100644 --- a/mojo/examples/sample_app/sample_app.cc +++ b/mojo/examples/sample_app/sample_app.cc @@ -9,10 +9,10 @@ #include "mojo/public/bindings/allocation_scope.h" #include "mojo/public/bindings/remote_ptr.h" #include "mojo/public/cpp/environment/environment.h" +#include "mojo/public/cpp/gles2/gles2.h" #include "mojo/public/cpp/system/core.h" #include "mojo/public/cpp/system/macros.h" #include "mojo/public/cpp/utility/run_loop.h" -#include "mojo/public/gles2/gles2_cpp.h" #include "mojo/public/shell/application.h" #include "mojo/public/shell/shell.mojom.h" #include "mojo/services/native_viewport/native_viewport.mojom.h" diff --git a/mojo/public/cpp/gles2/DEPS b/mojo/public/cpp/gles2/DEPS new file mode 100644 index 0000000..3c48be9 --- /dev/null +++ b/mojo/public/cpp/gles2/DEPS @@ -0,0 +1,4 @@ +include_rules = [ + "+mojo/public/c/gles2", + "+mojo/public/cpp/environment", +] diff --git a/mojo/public/gles2/gles2_cpp.h b/mojo/public/cpp/gles2/gles2.h index 46a0591..cf6686c 100644 --- a/mojo/public/gles2/gles2_cpp.h +++ b/mojo/public/cpp/gles2/gles2.h @@ -2,8 +2,8 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#ifndef MOJO_PUBLIC_GLES2_GLES2_CPP_H_ -#define MOJO_PUBLIC_GLES2_GLES2_CPP_H_ +#ifndef MOJO_PUBLIC_CPP_GLES2_GLES2_H_ +#define MOJO_PUBLIC_CPP_GLES2_GLES2_H_ #include "mojo/public/c/gles2/gles2.h" #include "mojo/public/cpp/environment/default_async_waiter.h" @@ -21,4 +21,4 @@ class GLES2Initializer { } // namespace mojo -#endif // MOJO_PUBLIC_GLES2_GLES2_H_ +#endif // MOJO_PUBLIC_CPP_GLES2_GLES2_H_ diff --git a/mojo/public/gles2/gles2_interface.h b/mojo/public/gles2/gles2_interface.h index f9fb2d8..19b958e 100644 --- a/mojo/public/gles2/gles2_interface.h +++ b/mojo/public/gles2/gles2_interface.h @@ -1,4 +1,4 @@ -// Copyright (c) 2014 The Chromium Authors. All rights reserved. +// Copyright 2014 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. |