chrome/browser/policy/device_management_policy_cache.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/policy/device_management_policy_cache.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/net/sqlite_persistent_cookie_store.cc ('k') | chrome/browser/policy/device_management_policy_cache.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/device_management_policy_cache.h

diff --git a/chrome/browser/policy/device_management_policy_cache.h b/chrome/browser/policy/device_management_policy_cache.h

index 9c09a07c91a7da75016c4e55daa80e6d28bc0d5b..39f5c30b595194fb792e3abfb9586d46c776405d 100644

--- a/chrome/browser/policy/device_management_policy_cache.h

+++ b/chrome/browser/policy/device_management_policy_cache.h

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

#include "base/file_path.h"

#include "base/gtest_prod_util.h"

-#include "base/lock.h"

#include "base/ref_counted.h"

#include "base/scoped_ptr.h"

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

#include "base/time.h"

#include "chrome/browser/policy/proto/device_management_backend.pb.h"

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

const FilePath backing_file_path_;

// Protects |policy_|.

- Lock lock_;

+ base::Lock lock_;

// Policy key-value information.

scoped_ptr<DictionaryValue> policy_;

« no previous file with comments | « chrome/browser/net/sqlite_persistent_cookie_store.cc ('k') | chrome/browser/policy/device_management_policy_cache.cc » ('j') | no next file with comments »