content/browser/gpu_process_host_ui_shim.cc - Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event

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: content/browser/gpu_process_host_ui_shim.cc

Issue 6862002: Merge gpu_trace_event back into base/debug/trace_event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: shared dll build, phishing test shutdown crashes, tsan warnings; merge 84612 Created 9 years, 7 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: content/browser/gpu_process_host_ui_shim.cc

diff --git a/content/browser/gpu_process_host_ui_shim.cc b/content/browser/gpu_process_host_ui_shim.cc

index e2dc11d733259a5c843eb857e6a76e871f525e0a..f429aa8715d37c8c045eae789e96e5b514c2cee2 100644

--- a/content/browser/gpu_process_host_ui_shim.cc

+++ b/content/browser/gpu_process_host_ui_shim.cc

@@ -6,6 +6,7 @@

#include "base/command_line.h"

#include "base/id_map.h"

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

#include "base/process_util.h"

#include "chrome/browser/browser_process.h"

#include "content/browser/browser_thread.h"

@@ -16,7 +17,6 @@

#include "content/browser/renderer_host/render_widget_host_view.h"

#include "content/common/content_switches.h"

#include "content/common/gpu/gpu_messages.h"

-#include "gpu/common/gpu_trace_event.h"

#if defined(OS_LINUX)

// These two #includes need to come after gpu_messages.h.