| Index: ui/gl/gl_bindings.h
|
| diff --git a/ui/gfx/gl/gl_bindings.h b/ui/gl/gl_bindings.h
|
| similarity index 95%
|
| rename from ui/gfx/gl/gl_bindings.h
|
| rename to ui/gl/gl_bindings.h
|
| index 751c7afb90c8d78e91f450d9b75c13158ca7fd21..625dac97315211b8364a45036699ba81cced3f1a 100644
|
| --- a/ui/gfx/gl/gl_bindings.h
|
| +++ b/ui/gl/gl_bindings.h
|
| @@ -2,21 +2,21 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| +#ifndef UI_GL_GL_BINDINGS_H_
|
| +#define UI_GL_GL_BINDINGS_H_
|
| +#pragma once
|
| +
|
| // Includes the platform independent and platform dependent GL headers.
|
| // Only include this in cc files. It pulls in system headers, including
|
| // the X11 headers on linux, which define all kinds of macros that are
|
| // liable to cause conflicts.
|
|
|
| -#ifndef UI_GFX_GL_GL_BINDINGS_H_
|
| -#define UI_GFX_GL_GL_BINDINGS_H_
|
| -#pragma once
|
| -
|
| #include <GL/gl.h>
|
| #include <GL/glext.h>
|
|
|
| -#include "build/build_config.h"
|
| #include "base/logging.h"
|
| -#include "ui/gfx/gl/gl_export.h"
|
| +#include "build/build_config.h"
|
| +#include "ui/gl/gl_export.h"
|
|
|
| // The standard OpenGL native extension headers are also included.
|
| #if defined(OS_WIN)
|
| @@ -102,4 +102,4 @@ void* GL_BINDING_CALL GetMockGLProcAddress(const char* name);
|
|
|
| } // namespace gfx
|
|
|
| -#endif // UI_GFX_GL_GL_BINDINGS_H_
|
| +#endif // UI_GL_GL_BINDINGS_H_
|
|
|