base/trace_event/trace_event_system_stats_monitor.cc - Issue 837303004: Move base/debug/trace_event* to base/trace_event/ [part 1]

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: base/trace_event/trace_event_system_stats_monitor.cc

Issue 837303004: Move base/debug/trace_event* to base/trace_event/ [part 1] (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing merge conflicts 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

Download patch

« no previous file with comments | « base/trace_event/trace_event_system_stats_monitor.h ('k') | base/trace_event/trace_event_system_stats_monitor_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: base/trace_event/trace_event_system_stats_monitor.cc

diff --git a/base/debug/trace_event_system_stats_monitor.cc b/base/trace_event/trace_event_system_stats_monitor.cc

similarity index 97%

rename from base/debug/trace_event_system_stats_monitor.cc

rename to base/trace_event/trace_event_system_stats_monitor.cc

index 9cbefd8d6cc14af406ce08d8ed33d3b20ac904f9..6fa0174577d05059564bf4cb850c8c23429c28e2 100644

--- a/base/debug/trace_event_system_stats_monitor.cc

+++ b/base/trace_event/trace_event_system_stats_monitor.cc

@@ -2,10 +2,9 @@

// Use of this source code is governed by a BSD-style license that can be

// found in the LICENSE file.

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

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

#include "base/debug/leak_annotations.h"

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

#include "base/json/json_writer.h"

#include "base/lazy_instance.h"

#include "base/logging.h"

@@ -14,6 +13,7 @@

#include "base/strings/string_util.h"

#include "base/thread_task_runner_handle.h"

#include "base/threading/thread_local_storage.h"

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

namespace base {

namespace debug {