Mojo: Move mojo/public/gles2/gles2_cpp.h to mojo/public/cpp/gles2/gles2.h.

R=darin@chromium.org

Review URL: https://codereview.chromium.org/218883003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@260492 0039d316-1c4b-4281-b951-d872f2087c98

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)

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"

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"

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"

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"

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"

mojo/public/cpp/gles2/DEPS

+include_rules = [
+  "+mojo/public/c/gles2",
+  "+mojo/public/cpp/environment",
+]

mojo/public/gles2/gles2_cpp.h → 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_

mojo/public/gles2/gles2_interface.h

-// 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.