chrome/browser/sync/glue/autofill_model_associator.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/sync/glue/autofill_model_associator.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/sync/glue/autofill_data_type_controller.cc ('k') | chrome/browser/sync/glue/autofill_model_associator.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/sync/glue/autofill_model_associator.h

diff --git a/chrome/browser/sync/glue/autofill_model_associator.h b/chrome/browser/sync/glue/autofill_model_associator.h

index fb660e6dbdea892e2387ba816b43ed66d54747b7..a0eee277ed77802b11e923062fb81b92658de73f 100644

--- a/chrome/browser/sync/glue/autofill_model_associator.h

+++ b/chrome/browser/sync/glue/autofill_model_associator.h

@@ -12,8 +12,8 @@

#include <vector>

#include "base/basictypes.h"

-#include "base/lock.h"

#include "base/ref_counted.h"

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

#include "chrome/browser/autofill/personal_data_manager.h"

#include "chrome/browser/sync/engine/syncapi.h"

#include "chrome/browser/sync/glue/model_associator.h"

@@ -183,7 +183,7 @@ class AutofillModelAssociator

// Abort association pending flag and lock. If this is set to true

// (via the AbortAssociation method), return from the

// AssociateModels method as soon as possible.

- Lock abort_association_pending_lock_;

+ base::Lock abort_association_pending_lock_;

bool abort_association_pending_;

int number_of_entries_created_;

« no previous file with comments | « chrome/browser/sync/glue/autofill_data_type_controller.cc ('k') | chrome/browser/sync/glue/autofill_model_associator.cc » ('j') | no next file with comments »