gpu/config/gpu_info_collector.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: gpu/config/gpu_info_collector.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: gpu/config/gpu_info_collector.cc

diff --git a/gpu/config/gpu_info_collector.cc b/gpu/config/gpu_info_collector.cc

index 5d255460b52eaaef085d9dc3f3ec9a6c95f30926..fd1ff8b736e0f9f44139376b14f6e710e7a49742 100644

--- a/gpu/config/gpu_info_collector.cc

+++ b/gpu/config/gpu_info_collector.cc

@@ -7,12 +7,12 @@

#include <string>

#include <vector>

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

#include "base/logging.h"

#include "base/memory/scoped_ptr.h"

#include "base/strings/string_number_conversions.h"

#include "base/strings/string_piece.h"

#include "base/strings/string_split.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"