ui/gl/gl_surface_glx.cc - Issue 895853003: Update from https://crrev.com/314320 - Code Review

Chromium Code Reviews

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

(701)

My Issues | Starred Open | Closed | All

Unified Diff: ui/gl/gl_surface_glx.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:

View side-by-side diff with in-line comments

« no previous file with comments | « ui/gl/gl_surface_egl.cc ('k') | ui/gl/gl_surface_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: ui/gl/gl_surface_glx.cc

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

index de888e538de6a371fea3be5e8cdc73f203af3ef1..5a3eafd70b589c9a7404adf5df09e5079c3e31e3 100644

--- a/ui/gl/gl_surface_glx.cc

+++ b/ui/gl/gl_surface_glx.cc

@@ -9,7 +9,6 @@ extern "C" {

#include "ui/gl/gl_surface_glx.h"

#include "base/basictypes.h"

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

#include "base/lazy_instance.h"

#include "base/logging.h"

#include "base/memory/scoped_ptr.h"

@@ -22,6 +21,7 @@ extern "C" {

#include "base/threading/non_thread_safe.h"

#include "base/threading/thread.h"

#include "base/time/time.h"

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

#include "ui/events/platform/platform_event_source.h"

#include "ui/gfx/x/x11_connection.h"

#include "ui/gfx/x/x11_types.h"

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

Powered by Google App Engine

This is Rietveld 408576698