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

Side by Side Diff: ui/gl/gl_surface_x11.cc

Issue 1868363002: Replace scoped_ptr with std::unique_ptr in //ui (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@scopedptrcc
Patch Set: scopedptrui: rebase-make_scoped_ptr Created 4 years, 8 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
« no previous file with comments | « ui/gl/gl_surface_win.cc ('k') | ui/gl/glx_api_unittest.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 #include "ui/gl/gl_surface.h" 5 #include "ui/gl/gl_surface.h"
6 6
7 #include <stdint.h> 7 #include <stdint.h>
8 8
9 #include <memory>
10
9 #include "base/logging.h" 11 #include "base/logging.h"
10 #include "base/macros.h" 12 #include "base/macros.h"
11 #include "base/memory/scoped_ptr.h"
12 #include "base/message_loop/message_loop.h" 13 #include "base/message_loop/message_loop.h"
13 #include "base/trace_event/trace_event.h" 14 #include "base/trace_event/trace_event.h"
14 #include "ui/gfx/native_widget_types.h" 15 #include "ui/gfx/native_widget_types.h"
15 #include "ui/gfx/x/x11_types.h" 16 #include "ui/gfx/x/x11_types.h"
16 #include "ui/gl/gl_bindings.h" 17 #include "ui/gl/gl_bindings.h"
17 #include "ui/gl/gl_implementation.h" 18 #include "ui/gl/gl_implementation.h"
18 #include "ui/gl/gl_surface_egl.h" 19 #include "ui/gl/gl_surface_egl.h"
19 #include "ui/gl/gl_surface_egl_x11.h" 20 #include "ui/gl/gl_surface_egl_x11.h"
20 #include "ui/gl/gl_surface_glx.h" 21 #include "ui/gl/gl_surface_glx.h"
21 #include "ui/gl/gl_surface_osmesa.h" 22 #include "ui/gl/gl_surface_osmesa.h"
(...skipping 313 matching lines...) Expand 10 before | Expand all | Expand 10 after
335 NOTREACHED(); 336 NOTREACHED();
336 return NULL; 337 return NULL;
337 } 338 }
338 } 339 }
339 340
340 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() { 341 EGLNativeDisplayType GetPlatformDefaultEGLNativeDisplay() {
341 return gfx::GetXDisplay(); 342 return gfx::GetXDisplay();
342 } 343 }
343 344
344 } // namespace gfx 345 } // namespace gfx
OLDNEW
« no previous file with comments | « ui/gl/gl_surface_win.cc ('k') | ui/gl/glx_api_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698