Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(460)

Side by Side Diff: ui/gl/gl_context_glx.h

Issue 10392068: ui: Move gl/ directory out of gfx/, up to ui/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix mac_rel Created 8 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « ui/gl/gl_context_egl.cc ('k') | ui/gl/gl_context_glx.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef UI_GFX_GL_GL_CONTEXT_GLX_H_ 5 #ifndef UI_GL_GL_CONTEXT_GLX_H_
6 #define UI_GFX_GL_GL_CONTEXT_GLX_H_ 6 #define UI_GL_GL_CONTEXT_GLX_H_
7 #pragma once
7 8
8 #include <string> 9 #include <string>
9 10
10 #include "base/compiler_specific.h" 11 #include "base/compiler_specific.h"
11 #include "ui/base/x/x11_util.h" 12 #include "ui/base/x/x11_util.h"
12 #include "ui/gfx/gl/gl_context.h" 13 #include "ui/gl/gl_context.h"
13 14
14 namespace gfx { 15 namespace gfx {
15 16
16 class GLSurface; 17 class GLSurface;
17 18
18 // Encapsulates a GLX OpenGL context. 19 // Encapsulates a GLX OpenGL context.
19 class GLContextGLX : public GLContext { 20 class GLContextGLX : public GLContext {
20 public: 21 public:
21 explicit GLContextGLX(GLShareGroup* share_group); 22 explicit GLContextGLX(GLShareGroup* share_group);
22 virtual ~GLContextGLX(); 23 virtual ~GLContextGLX();
(...skipping 14 matching lines...) Expand all
37 38
38 private: 39 private:
39 void* context_; 40 void* context_;
40 Display* display_; 41 Display* display_;
41 42
42 DISALLOW_COPY_AND_ASSIGN(GLContextGLX); 43 DISALLOW_COPY_AND_ASSIGN(GLContextGLX);
43 }; 44 };
44 45
45 } // namespace gfx 46 } // namespace gfx
46 47
47 #endif //UI_GFX_GL_GL_CONTEXT_GLX_H_ 48 #endif // UI_GL_GL_CONTEXT_GLX_H_
OLDNEW
« no previous file with comments | « ui/gl/gl_context_egl.cc ('k') | ui/gl/gl_context_glx.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698