chrome/common/worker_thread_ticker.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: chrome/common/worker_thread_ticker.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: chrome/common/worker_thread_ticker.h

diff --git a/chrome/common/worker_thread_ticker.h b/chrome/common/worker_thread_ticker.h

index d18feec2b80db3b5959263cd5bb17acd1891515c..07f85ebaf33a7aa10a6719e6712a496b4b08472d 100644

--- a/chrome/common/worker_thread_ticker.h

+++ b/chrome/common/worker_thread_ticker.h

@@ -8,7 +8,7 @@

#include <vector>

-#include "base/lock.h"

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

#include "base/threading/thread.h"

// This class provides the following functionality:

@@ -74,7 +74,7 @@ class WorkerThreadTicker {

typedef std::vector<Callback*> TickHandlerListType;

// Lock to protect is_running_ and tick_handler_list_

- Lock lock_;

+ base::Lock lock_;

base::Thread timer_thread_;

bool is_running_;

« no previous file with comments | « chrome/common/webmessageportchannel_impl.cc ('k') | chrome/common/worker_thread_ticker.cc » ('j') | no next file with comments »