chrome/browser/bookmarks/bookmark_model.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/bookmarks/bookmark_model.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

Index: chrome/browser/bookmarks/bookmark_model.h

diff --git a/chrome/browser/bookmarks/bookmark_model.h b/chrome/browser/bookmarks/bookmark_model.h

index 3155103149669e563b1e878e76f7154cc0516fef..956fa63c85a88e1c63843ce79464b80f6e80ec94 100644

--- a/chrome/browser/bookmarks/bookmark_model.h

+++ b/chrome/browser/bookmarks/bookmark_model.h

@@ -12,9 +12,9 @@

#include <vector>

#include "app/tree_node_model.h"

-#include "base/lock.h"

#include "base/observer_list.h"

#include "base/string16.h"

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

#include "base/synchronization/waitable_event.h"

#include "chrome/browser/bookmarks/bookmark_model_observer.h"

#include "chrome/browser/bookmarks/bookmark_service.h"

@@ -455,7 +455,7 @@ class BookmarkModel : public NotificationObserver, public BookmarkService {

// such, be sure and wrap all usage of it around url_lock_.

typedef std::multiset<BookmarkNode*, NodeURLComparator> NodesOrderedByURLSet;

NodesOrderedByURLSet nodes_ordered_by_url_set_;

- Lock url_lock_;

+ base::Lock url_lock_;

// Used for loading favicons and the empty history request.

CancelableRequestConsumerTSimple<BookmarkNode*> load_consumer_;

« no previous file with comments | « chrome/browser/automation/automation_resource_message_filter.h ('k') | chrome/browser/bookmarks/bookmark_model.cc » ('j') | no next file with comments »