chrome/browser/browser_thread.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/browser/browser_thread.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/browser/browser_thread.h

diff --git a/chrome/browser/browser_thread.h b/chrome/browser/browser_thread.h

index ce3c295ca1a7b6089eb0bc5fcee7dc78b410040e..dc4b00b2a4afb044bc20ef54d2cdabcac5bd54fc 100644

--- a/chrome/browser/browser_thread.h

+++ b/chrome/browser/browser_thread.h

@@ -6,7 +6,7 @@

#define CHROME_BROWSER_BROWSER_THREAD_H_

#pragma once

-#include "base/lock.h"

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

#include "base/task.h"

#include "base/threading/thread.h"

@@ -197,7 +197,7 @@ class BrowserThread : public base::Thread {

// This lock protects |browser_threads_|. Do not read or modify that array

// without holding this lock. Do not block while holding this lock.

- static Lock lock_;

+ static base::Lock lock_;

// An array of the BrowserThread objects. This array is protected by |lock_|.

// The threads are not owned by this array. Typically, the threads are owned

« no previous file with comments | « chrome/browser/bookmarks/bookmark_model.cc ('k') | chrome/browser/browser_thread.cc » ('j') | no next file with comments »