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

Issues Search
    My Issues | Starred     Open | Closed | All

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: merge to 84062 Created 9 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « content/browser/gpu_process_host.cc ('k') | content/browser/renderer_host/render_widget_host.cc » ('j') | content/browser/trace_controller.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 b02bbb825ef0108280bbc8b6d5f3ab80ae9b45a1..edfdbf14ca0cd7446f0b7aac02b811e969ff78cf 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.
« no previous file with comments | « content/browser/gpu_process_host.cc ('k') | content/browser/renderer_host/render_widget_host.cc » ('j') | content/browser/trace_controller.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698