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

21 files changed, 35 insertions, 35 deletions

diff --git a/mojo/apps/js/bindings/gl/context.cc b/mojo/apps/js/bindings/gl/context.cc
index 5f87e48..18c37e7 100644
--- a/mojo/apps/js/bindings/gl/context.cc
+++ b/mojo/apps/js/bindings/gl/context.cc
@@ -10,7 +10,7 @@
 #include "gin/array_buffer.h"
 #include "gin/object_template_builder.h"
 #include "gin/per_context_data.h"
-#include "mojo/public/gles2/gles2.h"
+#include "mojo/public/c/gles2/gles2.h"
 
 namespace gin {
 template<>
diff --git a/mojo/apps/js/bindings/gl/context.h b/mojo/apps/js/bindings/gl/context.h
index 7cf3979..905f0fd 100644
--- a/mojo/apps/js/bindings/gl/context.h
+++ b/mojo/apps/js/bindings/gl/context.h
@@ -13,7 +13,7 @@
 #include "gin/runner.h"
 #include "gin/wrappable.h"
 #include "mojo/bindings/js/handle.h"
-#include "mojo/public/gles2/gles2.h"
+#include "mojo/public/c/gles2/gles2.h"
 #include "v8/include/v8.h"
 
 namespace gin {
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"
diff --git a/mojo/gles2/gles2_context.cc b/mojo/gles2/gles2_context.cc
index 78c9ba4..6d4106d 100644
--- a/mojo/gles2/gles2_context.cc
+++ b/mojo/gles2/gles2_context.cc
@@ -7,8 +7,8 @@
 #include "gpu/command_buffer/client/gles2_cmd_helper.h"
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "gpu/command_buffer/client/transfer_buffer.h"
+#include "mojo/public/c/gles2/gles2.h"
 #include "mojo/public/cpp/system/core.h"
-#include "mojo/public/gles2/gles2.h"
 
 namespace mojo {
 namespace gles2 {
diff --git a/mojo/gles2/gles2_context.h b/mojo/gles2/gles2_context.h
index e6f1e9e..bd680ba 100644
--- a/mojo/gles2/gles2_context.h
+++ b/mojo/gles2/gles2_context.h
@@ -10,7 +10,7 @@
 #include "gpu/command_buffer/client/gles2_implementation.h"
 #include "mojo/gles2/command_buffer_client_impl.h"
 #include "mojo/public/bindings/remote_ptr.h"
-#include "mojo/public/gles2/gles2.h"
+#include "mojo/public/c/gles2/gles2.h"
 
 struct MojoGLES2ContextPrivate {};
 
diff --git a/mojo/gles2/gles2_support_impl.cc b/mojo/gles2/gles2_support_impl.cc
index d1330be..888cfde 100644
--- a/mojo/gles2/gles2_support_impl.cc
+++ b/mojo/gles2/gles2_support_impl.cc
@@ -28,7 +28,7 @@ class GLES2ImplForCommandBuffer : public GLES2Interface {
   virtual ReturnType Function PARAMETERS OVERRIDE {                \
     return gpu_interface_->Function ARGUMENTS;                     \
   }
-#include "mojo/public/gles2/gles2_call_visitor_autogen.h"
+#include "mojo/public/c/gles2/gles2_call_visitor_autogen.h"
 #undef VISIT_GL_CALL
 
  private:
diff --git a/mojo/mojo_public.gypi b/mojo/mojo_public.gypi
index 725527a..073d5e4 100644
--- a/mojo/mojo_public.gypi
+++ b/mojo/mojo_public.gypi
@@ -61,8 +61,8 @@
         ],
       },
       'sources': [
-        'public/gles2/gles2.h',
-        'public/gles2/gles2_export.h',
+        'public/c/gles2/gles2.h',
+        'public/c/gles2/gles2_export.h',
         'public/gles2/gles2_private.cc',
         'public/gles2/gles2_private.h',
       ],
diff --git a/mojo/public/gles2/gles2.h b/mojo/public/c/gles2/gles2.h
index f945859..6b20b9c 100644
--- a/mojo/public/gles2/gles2.h
+++ b/mojo/public/c/gles2/gles2.h
@@ -2,18 +2,18 @@
 // 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_H_
-#define MOJO_PUBLIC_GLES2_GLES2_H_
+#ifndef MOJO_PUBLIC_C_GLES2_GLES2_H_
+#define MOJO_PUBLIC_C_GLES2_GLES2_H_
 
 // Note: This header should be compilable as C.
 
 #include <stdint.h>
 #include <GLES2/gl2.h>
 
+#include "mojo/public/c/gles2/gles2_export.h"
+#include "mojo/public/c/gles2/gles2_types.h"
 #include "mojo/public/c/system/async_waiter.h"
 #include "mojo/public/c/system/core.h"
-#include "mojo/public/gles2/gles2_export.h"
-#include "mojo/public/gles2/gles2_types.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,11 +41,11 @@ MOJO_GLES2_EXPORT void* MojoGLES2GetContextSupport(MojoGLES2Context context);
 
 #define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) \
   MOJO_GLES2_EXPORT ReturnType GL_APIENTRY gl##Function PARAMETERS;
-#include "mojo/public/gles2/gles2_call_visitor_autogen.h"
+#include "mojo/public/c/gles2/gles2_call_visitor_autogen.h"
 #undef VISIT_GL_CALL
 
 #ifdef __cplusplus
 }  // extern "C"
 #endif
 
-#endif  // MOJO_PUBLIC_GLES2_GLES2_H_
+#endif  // MOJO_PUBLIC_C_GLES2_GLES2_H_
diff --git a/mojo/public/gles2/gles2_call_visitor_autogen.h b/mojo/public/c/gles2/gles2_call_visitor_autogen.h
index ef06a33..64adecf 100644
--- a/mojo/public/gles2/gles2_call_visitor_autogen.h
+++ b/mojo/public/c/gles2/gles2_call_visitor_autogen.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.
 
diff --git a/mojo/public/gles2/gles2_export.h b/mojo/public/c/gles2/gles2_export.h
index 0af46ed..4f8796d 100644
--- a/mojo/public/gles2/gles2_export.h
+++ b/mojo/public/c/gles2/gles2_export.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_EXPORT_H_
-#define MOJO_PUBLIC_GLES2_GLES2_EXPORT_H_
+#ifndef MOJO_PUBLIC_C_GLES2_GLES2_EXPORT_H_
+#define MOJO_PUBLIC_C_GLES2_GLES2_EXPORT_H_
 
 #if defined(WIN32)
 
@@ -23,4 +23,4 @@
 
 #endif  // defined(WIN32)
 
-#endif  // MOJO_PUBLIC_GLES2_GLES2_EXPORT_H_
+#endif  // MOJO_PUBLIC_C_GLES2_GLES2_EXPORT_H_
diff --git a/mojo/public/gles2/gles2_types.h b/mojo/public/c/gles2/gles2_types.h
index c7d2216..dd2a213 100644
--- a/mojo/public/gles2/gles2_types.h
+++ b/mojo/public/c/gles2/gles2_types.h
@@ -2,20 +2,20 @@
 // 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_TYPES_H_
-#define MOJO_PUBLIC_GLES2_GLES2_TYPES_H_
+#ifndef MOJO_PUBLIC_C_GLES2_GLES2_TYPES_H_
+#define MOJO_PUBLIC_C_GLES2_GLES2_TYPES_H_
 
 // Note: This header should be compilable as C.
 
 #include <stdint.h>
 
-#include "mojo/public/gles2/gles2_export.h"
+#include "mojo/public/c/gles2/gles2_export.h"
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
-typedef struct MojoGLES2ContextPrivate *MojoGLES2Context;
+typedef struct MojoGLES2ContextPrivate* MojoGLES2Context;
 typedef void (*MojoGLES2ContextLost)(void* closure);
 typedef void (*MojoGLES2DrawAnimationFrame)(void* closure);
 
@@ -23,4 +23,4 @@ typedef void (*MojoGLES2DrawAnimationFrame)(void* closure);
 }  // extern "C"
 #endif
 
-#endif  // MOJO_PUBLIC_GLES2_GLES2_TYPES_H_
+#endif  // MOJO_PUBLIC_C_GLES2_GLES2_TYPES_H_
diff --git a/mojo/public/gles2/gles2_cpp.h b/mojo/public/gles2/gles2_cpp.h
index 7f23835..46a0591 100644
--- a/mojo/public/gles2/gles2_cpp.h
+++ b/mojo/public/gles2/gles2_cpp.h
@@ -5,8 +5,8 @@
 #ifndef MOJO_PUBLIC_GLES2_GLES2_CPP_H_
 #define MOJO_PUBLIC_GLES2_GLES2_CPP_H_
 
+#include "mojo/public/c/gles2/gles2.h"
 #include "mojo/public/cpp/environment/default_async_waiter.h"
-#include "mojo/public/gles2/gles2.h"
 
 namespace mojo {
 
diff --git a/mojo/public/gles2/gles2_interface.h b/mojo/public/gles2/gles2_interface.h
index 78845ae229..f9fb2d8 100644
--- a/mojo/public/gles2/gles2_interface.h
+++ b/mojo/public/gles2/gles2_interface.h
@@ -14,7 +14,7 @@ class GLES2Interface {
   virtual ~GLES2Interface() {}
 #define VISIT_GL_CALL(Function, ReturnType, PARAMETERS, ARGUMENTS) \
   virtual ReturnType Function PARAMETERS = 0;
-#include "mojo/public/gles2/gles2_call_visitor_autogen.h"
+#include "mojo/public/c/gles2/gles2_call_visitor_autogen.h"
 #undef VISIT_GL_CALL
 };
 
diff --git a/mojo/public/gles2/gles2_private.cc b/mojo/public/gles2/gles2_private.cc
index 1752828..7887349 100644
--- a/mojo/public/gles2/gles2_private.cc
+++ b/mojo/public/gles2/gles2_private.cc
@@ -7,7 +7,7 @@
 #include <assert.h>
 #include <stddef.h>
 
-#include "mojo/public/gles2/gles2.h"
+#include "mojo/public/c/gles2/gles2.h"
 #include "mojo/public/gles2/gles2_interface.h"
 
 static mojo::GLES2Support* g_gles2_support = NULL;
@@ -75,7 +75,7 @@ void* MojoGLES2GetContextSupport(MojoGLES2Context context) {
   ReturnType gl##Function PARAMETERS {                             \
     return g_gles2_interface->Function ARGUMENTS;                  \
   }
-#include "mojo/public/gles2/gles2_call_visitor_autogen.h"
+#include "mojo/public/c/gles2/gles2_call_visitor_autogen.h"
 #undef VISIT_GL_CALL
 
 }  // extern "C"
diff --git a/mojo/public/gles2/gles2_private.h b/mojo/public/gles2/gles2_private.h
index 8e12b8f..591e043 100644
--- a/mojo/public/gles2/gles2_private.h
+++ b/mojo/public/gles2/gles2_private.h
@@ -7,10 +7,10 @@
 
 #include <stdint.h>
 
+#include "mojo/public/c/gles2/gles2_export.h"
+#include "mojo/public/c/gles2/gles2_types.h"
 #include "mojo/public/c/system/async_waiter.h"
 #include "mojo/public/cpp/system/core.h"
-#include "mojo/public/gles2/gles2_export.h"
-#include "mojo/public/gles2/gles2_types.h"
 
 namespace mojo {
 class GLES2Interface;