chrome/browser/cross_site_request_manager.cc - 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/cross_site_request_manager.cc

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/cross_site_request_manager.cc

diff --git a/chrome/browser/cross_site_request_manager.cc b/chrome/browser/cross_site_request_manager.cc

index d12e9a4192ad8d61477bd4bdef6eebc8e48331da..651493361d3d0a645f6fec54fd916c5bd9d4e0c3 100644

--- a/chrome/browser/cross_site_request_manager.cc

+++ b/chrome/browser/cross_site_request_manager.cc

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

bool CrossSiteRequestManager::HasPendingCrossSiteRequest(int renderer_id,

int render_view_id) {

- AutoLock lock(lock_);

+ base::AutoLock lock(lock_);

std::pair<int, int> key(renderer_id, render_view_id);

return pending_cross_site_views_.find(key) !=

@@ -18,7 +18,7 @@ bool CrossSiteRequestManager::HasPendingCrossSiteRequest(int renderer_id,

void CrossSiteRequestManager::SetHasPendingCrossSiteRequest(int renderer_id,

int render_view_id,

bool has_pending) {

- AutoLock lock(lock_);

+ base::AutoLock lock(lock_);

std::pair<int, int> key(renderer_id, render_view_id);

if (has_pending) {

« no previous file with comments | « chrome/browser/cross_site_request_manager.h ('k') | chrome/browser/device_orientation/provider_unittest.cc » ('j') | no next file with comments »