Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(77)

Unified Diff: printing/printed_document.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 | « printing/backend/print_backend_cups.cc ('k') | printing/printed_document.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/printed_document.h
diff --git a/printing/printed_document.h b/printing/printed_document.h
index c471b80fa8cbcc6c4a1e8a5633d60ad9272cbd20..599d4539051e3c780055df8f76391372bc286c32 100644
--- a/printing/printed_document.h
+++ b/printing/printed_document.h
@@ -7,10 +7,10 @@
#include <map>
-#include "base/lock.h"
#include "base/ref_counted.h"
#include "base/scoped_ptr.h"
#include "base/string16.h"
+#include "base/synchronization/lock.h"
#include "gfx/native_widget_types.h"
#include "googleurl/src/gurl.h"
#include "printing/print_settings.h"
@@ -194,7 +194,7 @@ class PrintedDocument : public base::RefCountedThreadSafe<PrintedDocument> {
// All writable data member access must be guarded by this lock. Needs to be
// mutable since it can be acquired from const member functions.
- mutable Lock lock_;
+ mutable base::Lock lock_;
// All the mutable members.
Mutable mutable_;
« no previous file with comments | « printing/backend/print_backend_cups.cc ('k') | printing/printed_document.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698