| Index: ui/gl/gl_context_nsview.h
|
| diff --git a/ui/gl/gl_context_nsview.h b/ui/gl/gl_context_nsview.h
|
| index f4f4df713baf0c44f81159b86156e24e35497155..5f90738902ffaab2011f7f74b3f5f5459d13f7ea 100644
|
| --- a/ui/gl/gl_context_nsview.h
|
| +++ b/ui/gl/gl_context_nsview.h
|
| @@ -8,7 +8,7 @@
|
| #import <AppKit/NSOpenGL.h>
|
|
|
| #include "base/compiler_specific.h"
|
| -#include "base/memory/scoped_nsobject.h"
|
| +#include "base/mac/scoped_nsobject.h"
|
| #include "ui/gl/gl_context.h"
|
|
|
| namespace gfx {
|
| @@ -36,7 +36,7 @@ class GLContextNSView : public GLContextReal {
|
| void FlushBuffer();
|
|
|
| private:
|
| - scoped_nsobject<NSOpenGLContext> context_;
|
| + base::scoped_nsobject<NSOpenGLContext> context_;
|
| GpuPreference gpu_preference_;
|
|
|
| DISALLOW_COPY_AND_ASSIGN(GLContextNSView);
|
|
|