ui/gl/gl_surface_mac.cc - Issue 895853003: Update from https://crrev.com/314320

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ui/gl/gl_surface_mac.cc

Issue 895853003: Update from https://crrev.com/314320 (Closed) Base URL: https://github.com/domokit/mojo.git@master

Patch Set: Created 5 years, 11 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:

Index: ui/gl/gl_surface_mac.cc

diff --git a/ui/gl/gl_surface_mac.cc b/ui/gl/gl_surface_mac.cc

index 4b4624495c7de4942da3b5a1c634d0ff16197361..4ba560db50deb850444095636fdaaf7173c94410 100644

--- a/ui/gl/gl_surface_mac.cc

+++ b/ui/gl/gl_surface_mac.cc

@@ -7,9 +7,9 @@

#include <OpenGL/CGLRenderers.h>

#include "base/basictypes.h"

-#include "base/debug/trace_event.h"

#include "base/logging.h"

#include "base/memory/scoped_ptr.h"

+#include "base/trace_event/trace_event.h"

#include "ui/gl/gl_bindings.h"

#include "ui/gl/gl_context.h"

#include "ui/gl/gl_implementation.h"

« no previous file with comments | « ui/gl/gl_surface_glx.cc ('k') | ui/gl/gl_surface_wgl.cc » ('j') | no next file with comments »