diff options
| author | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-28 19:10:44 +0000 |
|---|---|---|
| committer | tfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-28 19:10:44 +0000 |
| commit | 4d8a2c7a25ba42015aa08718149a9f1c3d32614b (patch) | |
| tree | 392f1b3a8ca667117e434893031df3e2f56274ed /ui/gl | |
| parent | 2cdbdba8020a8593add5d4dce268757cda3de36c (diff) | |
| download | chromium_src-4d8a2c7a25ba42015aa08718149a9f1c3d32614b.zip chromium_src-4d8a2c7a25ba42015aa08718149a9f1c3d32614b.tar.gz chromium_src-4d8a2c7a25ba42015aa08718149a9f1c3d32614b.tar.bz2 | |
gl: Move egl_util* into ui namespace.
BUG=127983
TBR=apatrick@chromium.org
Review URL: https://chromiumcodereview.appspot.com/11345003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164569 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gl')
| -rw-r--r-- | ui/gl/egl_util.cc | 4 | ||||
| -rw-r--r-- | ui/gl/egl_util.h | 4 | ||||
| -rw-r--r-- | ui/gl/gl_context_egl.cc | 2 | ||||
| -rw-r--r-- | ui/gl/gl_surface_android.cc | 2 | ||||
| -rw-r--r-- | ui/gl/gl_surface_egl.cc | 2 |
5 files changed, 10 insertions, 4 deletions
diff --git a/ui/gl/egl_util.cc b/ui/gl/egl_util.cc index 91d1b12..60d8ff6 100644 --- a/ui/gl/egl_util.cc +++ b/ui/gl/egl_util.cc @@ -13,7 +13,7 @@ // This needs to be after the EGL includes #include "ui/gl/gl_bindings.h" -namespace gfx { +namespace ui { // Returns the last EGL error as a string. const char* GetLastEGLErrorString() { @@ -50,4 +50,4 @@ const char* GetLastEGLErrorString() { } } -} // namespace gfx +} // namespace ui diff --git a/ui/gl/egl_util.h b/ui/gl/egl_util.h index 57aab2a..c0fe4ce 100644 --- a/ui/gl/egl_util.h +++ b/ui/gl/egl_util.h @@ -5,11 +5,11 @@ #ifndef UI_GL_EGL_UTIL_H_ #define UI_GL_EGL_UTIL_H_ -namespace gfx { +namespace ui { // Returns the last EGL error as a string. const char* GetLastEGLErrorString(); -} // namespace gfx +} // namespace ui #endif // UI_GL_EGL_UTIL_H_ diff --git a/ui/gl/gl_context_egl.cc b/ui/gl/gl_context_egl.cc index dc406f4..6fd85b9 100644 --- a/ui/gl/gl_context_egl.cc +++ b/ui/gl/gl_context_egl.cc @@ -23,6 +23,8 @@ extern "C" { } #endif +using ui::GetLastEGLErrorString; + namespace gfx { GLContextEGL::GLContextEGL(GLShareGroup* share_group) diff --git a/ui/gl/gl_surface_android.cc b/ui/gl/gl_surface_android.cc index ebd88ca..9e90699 100644 --- a/ui/gl/gl_surface_android.cc +++ b/ui/gl/gl_surface_android.cc @@ -14,6 +14,8 @@ #include "ui/gl/gl_context.h" #include "ui/gl/gl_implementation.h" +using ui::GetLastEGLErrorString; + namespace gfx { bool GLSurface::InitializeOneOffInternal() { diff --git a/ui/gl/gl_surface_egl.cc b/ui/gl/gl_surface_egl.cc index e9a9618..9aa0816 100644 --- a/ui/gl/gl_surface_egl.cc +++ b/ui/gl/gl_surface_egl.cc @@ -23,6 +23,8 @@ extern "C" { } #endif +using ui::GetLastEGLErrorString; + namespace gfx { namespace { |