chrome/browser/geolocation/gateway_data_provider_common.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/geolocation/gateway_data_provider_common.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

« no previous file with comments | « chrome/browser/geolocation/gateway_data_provider_common.h ('k') | chrome/browser/geolocation/wifi_data_provider_common.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/geolocation/gateway_data_provider_common.cc

diff --git a/chrome/browser/geolocation/gateway_data_provider_common.cc b/chrome/browser/geolocation/gateway_data_provider_common.cc

index 363967cd42ab198cd088ffafec3a27df61ff0aae..2289371d5b33acb8cdc5e5e22ce81d63c2f56adf 100644

--- a/chrome/browser/geolocation/gateway_data_provider_common.cc

+++ b/chrome/browser/geolocation/gateway_data_provider_common.cc

@@ -32,7 +32,7 @@ void GatewayDataProviderCommon::StopDataProvider() {

bool GatewayDataProviderCommon::GetData(GatewayData *data) {

DCHECK(CalledOnClientThread());

DCHECK(data);

- AutoLock lock(data_mutex_);

+ base::AutoLock lock(data_mutex_);

*data = gateway_data_;

// If we've successfully completed a scan, indicate that we have all of the

// data we can get.

@@ -67,7 +67,7 @@ void GatewayDataProviderCommon::DoRouterScanTask() {

ScheduleNextScan(polling_policy_->NoRouterInterval());

} else {

{

- AutoLock lock(data_mutex_);

+ base::AutoLock lock(data_mutex_);

update_available = gateway_data_.DiffersSignificantly(new_data);

gateway_data_ = new_data;

}