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

Unified Diff: printing/printed_document.cc

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/printed_document.h ('k') | printing/printed_document_mac.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: printing/printed_document.cc
diff --git a/printing/printed_document.cc b/printing/printed_document.cc
index 5993b3df26f457c870d93cf4ef5345b5ea0f85e6..5badbc66c2772997014d3f9df3e86d5932b1a3f0 100644
--- a/printing/printed_document.cc
+++ b/printing/printed_document.cc
@@ -78,7 +78,7 @@ void PrintedDocument::SetPage(int page_number,
page_rect,
has_visible_overlays));
{
- AutoLock lock(lock_);
+ base::AutoLock lock(lock_);
mutable_.pages_[page_number] = page;
if (mutable_.shrink_factor == 0) {
mutable_.shrink_factor = shrink;
@@ -91,7 +91,7 @@ void PrintedDocument::SetPage(int page_number,
bool PrintedDocument::GetPage(int page_number,
scoped_refptr<PrintedPage>* page) {
- AutoLock lock(lock_);
+ base::AutoLock lock(lock_);
PrintedPages::const_iterator itr = mutable_.pages_.find(page_number);
if (itr != mutable_.pages_.end()) {
if (itr->second.get()) {
@@ -103,7 +103,7 @@ bool PrintedDocument::GetPage(int page_number,
}
bool PrintedDocument::IsComplete() const {
- AutoLock lock(lock_);
+ base::AutoLock lock(lock_);
if (!mutable_.page_count_)
return false;
PageNumber page(immutable_.settings_, mutable_.page_count_);
@@ -119,14 +119,14 @@ bool PrintedDocument::IsComplete() const {
}
void PrintedDocument::DisconnectSource() {
- AutoLock lock(lock_);
+ base::AutoLock lock(lock_);
mutable_.source_ = NULL;
}
uint32 PrintedDocument::MemoryUsage() const {
std::vector< scoped_refptr<PrintedPage> > pages_copy;
{
- AutoLock lock(lock_);
+ base::AutoLock lock(lock_);
pages_copy.reserve(mutable_.pages_.size());
PrintedPages::const_iterator end = mutable_.pages_.end();
for (PrintedPages::const_iterator itr = mutable_.pages_.begin();
@@ -144,7 +144,7 @@ uint32 PrintedDocument::MemoryUsage() const {
}
void PrintedDocument::set_page_count(int max_page) {
- AutoLock lock(lock_);
+ base::AutoLock lock(lock_);
DCHECK_EQ(0, mutable_.page_count_);
mutable_.page_count_ = max_page;
if (immutable_.settings_.ranges.empty()) {
@@ -157,12 +157,12 @@ void PrintedDocument::set_page_count(int max_page) {
}
int PrintedDocument::page_count() const {
- AutoLock lock(lock_);
+ base::AutoLock lock(lock_);
return mutable_.page_count_;
}
int PrintedDocument::expected_page_count() const {
- AutoLock lock(lock_);
+ base::AutoLock lock(lock_);
return mutable_.expected_page_count_;
}
« no previous file with comments | « printing/printed_document.h ('k') | printing/printed_document_mac.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698