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

Unified Diff: chrome/browser/printing/print_job.cc

Issue 11534: Add superficial unit test for PrintJob. That's a start.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 12 years, 1 month 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 | « chrome/browser/printing/print_job.h ('k') | chrome/browser/printing/print_job_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/printing/print_job.cc
===================================================================
--- chrome/browser/printing/print_job.cc (revision 5751)
+++ chrome/browser/printing/print_job.cc (working copy)
@@ -24,6 +24,8 @@
is_job_pending_(false),
is_print_dialog_box_shown_(false),
is_canceling_(false) {
+ DCHECK(ui_message_loop_);
+ ui_message_loop_->AddDestructionObserver(this);
}
PrintJob::PrintJob()
@@ -34,14 +36,18 @@
is_job_pending_(false),
is_print_dialog_box_shown_(false),
is_canceling_(false) {
+ DCHECK(ui_message_loop_);
+ ui_message_loop_->AddDestructionObserver(this);
}
PrintJob::~PrintJob() {
+ ui_message_loop_->RemoveDestructionObserver(this);
// The job should be finished (or at least canceled) when it is destroyed.
DCHECK(!is_job_pending_);
DCHECK(!is_print_dialog_box_shown_);
DCHECK(!is_canceling_);
- DCHECK(worker_->message_loop() == NULL);
+ if (worker_.get())
+ DCHECK(worker_->message_loop() == NULL);
DCHECK_EQ(ui_message_loop_, MessageLoop::current());
}
@@ -142,6 +148,10 @@
return document_->cookie();
}
+void PrintJob::WillDestroyCurrentMessageLoop() {
+ NOTREACHED();
+}
+
void PrintJob::GetSettings(GetSettingsAskParam ask_user_for_settings,
HWND parent_window) {
DCHECK_EQ(ui_message_loop_, MessageLoop::current());
« no previous file with comments | « chrome/browser/printing/print_job.h ('k') | chrome/browser/printing/print_job_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698