| Index: chrome/browser/printing/print_job_worker.cc
|
| diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
|
| index 70459ed795e43963c3b0a47e06c26a00e39e2e76..a90cda0f36d0b95bf4c87b37c68a59da7b898ae3 100644
|
| --- a/chrome/browser/printing/print_job_worker.cc
|
| +++ b/chrome/browser/printing/print_job_worker.cc
|
| @@ -53,7 +53,7 @@ PrintJobWorker::PrintJobWorker(PrintJobWorkerOwner* owner)
|
| owner_(owner),
|
| weak_factory_(this) {
|
| // The object is created in the IO thread.
|
| - DCHECK_EQ(owner_->message_loop(), MessageLoop::current());
|
| + DCHECK_EQ(owner_->message_loop(), base::MessageLoop::current());
|
|
|
| printing_context_.reset(PrintingContext::Create(
|
| g_browser_process->GetApplicationLocale()));
|
| @@ -63,7 +63,7 @@ PrintJobWorker::~PrintJobWorker() {
|
| // The object is normally deleted in the UI thread, but when the user
|
| // cancels printing or in the case of print preview, the worker is destroyed
|
| // on the I/O thread.
|
| - DCHECK_EQ(owner_->message_loop(), MessageLoop::current());
|
| + DCHECK_EQ(owner_->message_loop(), base::MessageLoop::current());
|
| Stop();
|
| }
|
|
|
| @@ -82,7 +82,7 @@ void PrintJobWorker::GetSettings(bool ask_user_for_settings,
|
| int document_page_count,
|
| bool has_selection,
|
| MarginType margin_type) {
|
| - DCHECK_EQ(message_loop(), MessageLoop::current());
|
| + DCHECK_EQ(message_loop(), base::MessageLoop::current());
|
| DCHECK_EQ(page_number_, PageNumber::npos());
|
|
|
| // Recursive task processing is needed for the dialog in case it needs to be
|
| @@ -112,7 +112,7 @@ void PrintJobWorker::GetSettings(bool ask_user_for_settings,
|
| }
|
|
|
| void PrintJobWorker::SetSettings(const DictionaryValue* const new_settings) {
|
| - DCHECK_EQ(message_loop(), MessageLoop::current());
|
| + DCHECK_EQ(message_loop(), base::MessageLoop::current());
|
|
|
| BrowserThread::PostTask(
|
| BrowserThread::UI, FROM_HERE,
|
| @@ -194,7 +194,7 @@ void PrintJobWorker::UseDefaultSettings() {
|
| }
|
|
|
| void PrintJobWorker::StartPrinting(PrintedDocument* new_document) {
|
| - DCHECK_EQ(message_loop(), MessageLoop::current());
|
| + DCHECK_EQ(message_loop(), base::MessageLoop::current());
|
| DCHECK_EQ(page_number_, PageNumber::npos());
|
| DCHECK_EQ(document_, new_document);
|
| DCHECK(document_.get());
|
| @@ -228,7 +228,7 @@ void PrintJobWorker::StartPrinting(PrintedDocument* new_document) {
|
| }
|
|
|
| void PrintJobWorker::OnDocumentChanged(PrintedDocument* new_document) {
|
| - DCHECK_EQ(message_loop(), MessageLoop::current());
|
| + DCHECK_EQ(message_loop(), base::MessageLoop::current());
|
| DCHECK_EQ(page_number_, PageNumber::npos());
|
| DCHECK(!new_document ||
|
| new_document->settings().Equals(printing_context_->settings()));
|
| @@ -244,7 +244,7 @@ void PrintJobWorker::OnNewPage() {
|
| return;
|
|
|
| // message_loop() could return NULL when the print job is cancelled.
|
| - DCHECK_EQ(message_loop(), MessageLoop::current());
|
| + DCHECK_EQ(message_loop(), base::MessageLoop::current());
|
|
|
| if (page_number_ == PageNumber::npos()) {
|
| // Find first page to print.
|
| @@ -267,7 +267,7 @@ void PrintJobWorker::OnNewPage() {
|
| scoped_refptr<PrintedPage> page;
|
| if (!document_->GetPage(page_number_.ToInt(), &page)) {
|
| // We need to wait for the page to be available.
|
| - MessageLoop::current()->PostDelayedTask(
|
| + base::MessageLoop::current()->PostDelayedTask(
|
| FROM_HERE,
|
| base::Bind(&PrintJobWorker::OnNewPage, weak_factory_.GetWeakPtr()),
|
| base::TimeDelta::FromMilliseconds(500));
|
| @@ -292,7 +292,7 @@ void PrintJobWorker::Cancel() {
|
| }
|
|
|
| void PrintJobWorker::OnDocumentDone() {
|
| - DCHECK_EQ(message_loop(), MessageLoop::current());
|
| + DCHECK_EQ(message_loop(), base::MessageLoop::current());
|
| DCHECK_EQ(page_number_, PageNumber::npos());
|
| DCHECK(document_.get());
|
|
|
| @@ -311,7 +311,7 @@ void PrintJobWorker::OnDocumentDone() {
|
| }
|
|
|
| void PrintJobWorker::SpoolPage(PrintedPage* page) {
|
| - DCHECK_EQ(message_loop(), MessageLoop::current());
|
| + DCHECK_EQ(message_loop(), base::MessageLoop::current());
|
| DCHECK_NE(page_number_, PageNumber::npos());
|
|
|
| // Signal everyone that the page is about to be printed.
|
| @@ -360,7 +360,7 @@ void PrintJobWorker::SpoolPage(PrintedPage* page) {
|
| }
|
|
|
| void PrintJobWorker::OnFailure() {
|
| - DCHECK_EQ(message_loop(), MessageLoop::current());
|
| + DCHECK_EQ(message_loop(), base::MessageLoop::current());
|
|
|
| // We may loose our last reference by broadcasting the FAILED event.
|
| scoped_refptr<PrintJobWorkerOwner> handle(owner_);
|
|
|