chrome/browser/content_settings/pref_content_settings_provider.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/content_settings/pref_content_settings_provider.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

« no previous file with comments | « chrome/browser/content_settings/policy_content_settings_provider.cc ('k') | chrome/browser/content_settings/pref_content_settings_provider.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/content_settings/pref_content_settings_provider.h

diff --git a/chrome/browser/content_settings/pref_content_settings_provider.h b/chrome/browser/content_settings/pref_content_settings_provider.h

index 178e903b97bb22127f324dc5dc0406e0d1b9a0fd..442851e7f6c5854bbb84f8cc50a012bbe2f87826 100644

--- a/chrome/browser/content_settings/pref_content_settings_provider.h

+++ b/chrome/browser/content_settings/pref_content_settings_provider.h

@@ -9,7 +9,7 @@

// A content settings provider that takes its settings out of the pref service.

#include "base/basictypes.h"

-#include "base/lock.h"

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

#include "chrome/browser/content_settings/content_settings_provider.h"

#include "chrome/browser/prefs/pref_change_registrar.h"

#include "chrome/common/notification_observer.h"

@@ -73,7 +73,7 @@ class PrefContentSettingsProvider : public ContentSettingsProviderInterface,

// Used around accesses to the default_content_settings_ object to guarantee

// thread safety.

- mutable Lock lock_;

+ mutable base::Lock lock_;

PrefChangeRegistrar pref_change_registrar_;

NotificationRegistrar notification_registrar_;