diff options
| author | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-30 20:40:17 +0000 |
|---|---|---|
| committer | viettrungluu@chromium.org <viettrungluu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-03-30 20:40:17 +0000 |
| commit | 487622d038c3f0d10294180d1b635f58fc110a1c (patch) | |
| tree | 165d07c38fbb60c5e9f9d9a5cef28da5f0595ea4 /mojo/examples | |
| parent | 91419219bd1d98ce90ab87688069fb0781855dab (diff) | |
| download | chromium_src-487622d038c3f0d10294180d1b635f58fc110a1c.zip chromium_src-487622d038c3f0d10294180d1b635f58fc110a1c.tar.gz chromium_src-487622d038c3f0d10294180d1b635f58fc110a1c.tar.bz2 | |
Mojo: Move C gles2 header files to mojo/public/c/gles2.
(C++ files still to do.)
Also, as a drive-by, update the generated copyright notice in
build_gles2_cmd_buffer.py to the correct, current one (no "(c)").
R=darin@chromium.org
TBR=piman@chromium.org
Review URL: https://codereview.chromium.org/218193002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260459 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'mojo/examples')
7 files changed, 7 insertions, 7 deletions
diff --git a/mojo/examples/aura_demo/window_tree_host_mojo.cc b/mojo/examples/aura_demo/window_tree_host_mojo.cc index b032323..4e94938 100644 --- a/mojo/examples/aura_demo/window_tree_host_mojo.cc +++ b/mojo/examples/aura_demo/window_tree_host_mojo.cc @@ -6,7 +6,7 @@ #include "mojo/examples/aura_demo/demo_context_factory.h" #include "mojo/public/bindings/allocation_scope.h" -#include "mojo/public/gles2/gles2.h" +#include "mojo/public/c/gles2/gles2.h" #include "mojo/services/native_viewport/geometry_conversions.h" #include "ui/aura/env.h" #include "ui/aura/window.h" diff --git a/mojo/examples/compositor_app/mojo_context_provider.h b/mojo/examples/compositor_app/mojo_context_provider.h index 4f2cc15..04abe80 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/c/gles2/gles2.h" #include "mojo/public/cpp/system/core.h" -#include "mojo/public/gles2/gles2.h" namespace mojo { namespace examples { diff --git a/mojo/examples/pepper_container_app/graphics_3d_resource.cc b/mojo/examples/pepper_container_app/graphics_3d_resource.cc index d354cef..6f05359 100644 --- a/mojo/examples/pepper_container_app/graphics_3d_resource.cc +++ b/mojo/examples/pepper_container_app/graphics_3d_resource.cc @@ -7,7 +7,7 @@ #include "base/logging.h" #include "mojo/examples/pepper_container_app/mojo_ppapi_globals.h" #include "mojo/examples/pepper_container_app/plugin_instance.h" -#include "mojo/public/gles2/gles2.h" +#include "mojo/public/c/gles2/gles2.h" #include "ppapi/c/pp_errors.h" namespace mojo { diff --git a/mojo/examples/pepper_container_app/graphics_3d_resource.h b/mojo/examples/pepper_container_app/graphics_3d_resource.h index 482c678..68d70e4 100644 --- a/mojo/examples/pepper_container_app/graphics_3d_resource.h +++ b/mojo/examples/pepper_container_app/graphics_3d_resource.h @@ -7,7 +7,7 @@ #include "base/compiler_specific.h" #include "base/macros.h" -#include "mojo/public/gles2/gles2_types.h" +#include "mojo/public/c/gles2/gles2_types.h" #include "ppapi/shared_impl/resource.h" #include "ppapi/shared_impl/tracked_callback.h" #include "ppapi/thunk/ppb_graphics_3d_api.h" diff --git a/mojo/examples/pepper_container_app/ppb_opengles2_thunk.cc b/mojo/examples/pepper_container_app/ppb_opengles2_thunk.cc index 56fc891..c5097bb 100644 --- a/mojo/examples/pepper_container_app/ppb_opengles2_thunk.cc +++ b/mojo/examples/pepper_container_app/ppb_opengles2_thunk.cc @@ -5,7 +5,7 @@ #include "base/logging.h" #include "mojo/examples/pepper_container_app/graphics_3d_resource.h" #include "mojo/examples/pepper_container_app/thunk.h" -#include "mojo/public/gles2/gles2.h" +#include "mojo/public/c/gles2/gles2.h" #include "ppapi/thunk/enter.h" #include "ppapi/thunk/ppb_graphics_3d_api.h" diff --git a/mojo/examples/sample_app/gles2_client_impl.cc b/mojo/examples/sample_app/gles2_client_impl.cc index 8abff8b..ca26b2d 100644 --- a/mojo/examples/sample_app/gles2_client_impl.cc +++ b/mojo/examples/sample_app/gles2_client_impl.cc @@ -8,7 +8,7 @@ #include <GLES2/gl2ext.h> #include <math.h> -#include "mojo/public/gles2/gles2.h" +#include "mojo/public/c/gles2/gles2.h" #include "ui/events/event_constants.h" namespace mojo { diff --git a/mojo/examples/sample_app/gles2_client_impl.h b/mojo/examples/sample_app/gles2_client_impl.h index 759140f..f84477b 100644 --- a/mojo/examples/sample_app/gles2_client_impl.h +++ b/mojo/examples/sample_app/gles2_client_impl.h @@ -7,7 +7,7 @@ #include "mojo/examples/sample_app/spinning_cube.h" #include "mojo/public/bindings/remote_ptr.h" -#include "mojo/public/gles2/gles2.h" +#include "mojo/public/c/gles2/gles2.h" #include "mojo/services/native_viewport/native_viewport.mojom.h" #include "ui/gfx/point_f.h" #include "ui/gfx/size.h" |