base/debug/trace_event.h - Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file.

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/debug/trace_event.h

Issue 6142009: Upating the app, ceee, chrome, ipc, media, and net directories to use the correct lock.h file. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk

Patch Set: Unified patch updating all references to the new base/synchronization/lock.h Created 9 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

Index: base/debug/trace_event.h

diff --git a/base/debug/trace_event.h b/base/debug/trace_event.h

index 160bbc86f4152bd8c24e961d3f5a3809dfe6e32b..3eb1f49a90d75989b0efc1cc1b4629500026dc27 100644

--- a/base/debug/trace_event.h

+++ b/base/debug/trace_event.h

@@ -31,9 +31,9 @@

#include <string>

-#include "base/lock.h"

#include "base/scoped_ptr.h"

#include "base/singleton.h"

+#include "base/synchronization/lock.h"

#include "base/time.h"

#include "base/timer.h"

@@ -135,7 +135,7 @@ class TraceLog {

bool enabled_;

FILE* log_file_;

- Lock file_lock_;

+ base::Lock file_lock_;

TimeTicks trace_start_time_;

scoped_ptr<base::ProcessMetrics> process_metrics_;

RepeatingTimer<TraceLog> timer_;

« no previous file with comments | « base/at_exit.h ('k') | base/i18n/file_util_icu.cc » ('j') | no next file with comments »