| Index: ui/gfx/compositor/compositor_gl.h
|
| diff --git a/ui/gfx/compositor/compositor_gl.h b/ui/gfx/compositor/compositor_gl.h
|
| index 871f7aa7f456e7a76da666d1493b19c4a0f641c2..94475dc7004f4b2cd5901283ea698552368ca9af 100644
|
| --- a/ui/gfx/compositor/compositor_gl.h
|
| +++ b/ui/gfx/compositor/compositor_gl.h
|
| @@ -31,11 +31,7 @@ class COMPOSITOR_EXPORT SharedResourcesGL : public SharedResources {
|
| public:
|
| static SharedResourcesGL* GetInstance();
|
|
|
| - virtual bool MakeSharedContextCurrent();
|
| -
|
| - // Creates an instance of ScopedMakeCurrent.
|
| - // Note: Caller is responsible for managing lifetime of returned pointer.
|
| - gfx::ScopedMakeCurrent* GetScopedMakeCurrent();
|
| + virtual gfx::ScopedMakeCurrent* GetScopedMakeCurrent() OVERRIDE;
|
|
|
| // Creates a context that shares the resources hosted by this singleton.
|
| scoped_refptr<gfx::GLContext> CreateContext(gfx::GLSurface* surface);
|
|
|