base/metrics/field_trial.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/metrics/field_trial.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/metrics/field_trial.h

diff --git a/base/metrics/field_trial.h b/base/metrics/field_trial.h

index 89020773cf0438a19bb95d69e1d80db34f38f707..15c48923018bb6689544e604ed179bae17947b2f 100644

--- a/base/metrics/field_trial.h

+++ b/base/metrics/field_trial.h

@@ -66,8 +66,8 @@

#include <map>

#include <string>

-#include "base/lock.h"

#include "base/ref_counted.h"

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

#include "base/time.h"

namespace base {

@@ -236,7 +236,7 @@ class FieldTrialList {

TimeTicks application_start_time_;

// Lock for access to registered_.

- Lock lock_;

+ base::Lock lock_;

RegistrationList registered_;

DISALLOW_COPY_AND_ASSIGN(FieldTrialList);

« no previous file with comments | « base/message_loop_proxy_impl.h ('k') | base/metrics/stats_table.h » ('j') | no next file with comments »