diff options
| author | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
|---|---|---|
| committer | brettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-21 04:55:52 +0000 |
| commit | 20305ec6f1acf21392c2f3938a14a96f1e28e76d (patch) | |
| tree | 6eff1f7be4bad1a1362d3466f0ac59292dc51acc /printing/printed_document.h | |
| parent | c6e8346b56ab61b35845aefcf9b241c654fe1253 (diff) | |
| download | chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.zip chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.gz chromium_src-20305ec6f1acf21392c2f3938a14a96f1e28e76d.tar.bz2 | |
Remove obsolete base/lock.h and fix up callers to use the new header file and
the base namespace. Fix several files including lock.h unnecessarily.
BUG=none
TEST=none
Original review=http://codereview.chromium.org/6142009/
Patch by leviw@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@72106 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'printing/printed_document.h')
| -rw-r--r-- | printing/printed_document.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/printing/printed_document.h b/printing/printed_document.h index c471b80..599d453 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_; |