summaryrefslogtreecommitdiffstats
path: root/chrome/browser/printing/print_job.cc
diff options
context:
space:
mode:
authormaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-25 14:45:39 +0000
committermaruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2008-11-25 14:45:39 +0000
commit97f4fedbc16a3d1729acb8cfe1a7c892f840efa8 (patch)
treed01195ea3ad5aa60230724b737bdac496aca858d /chrome/browser/printing/print_job.cc
parent27abf503d7de0fde7178f8e69fe387a27f8e1d06 (diff)
downloadchromium_src-97f4fedbc16a3d1729acb8cfe1a7c892f840efa8.zip
chromium_src-97f4fedbc16a3d1729acb8cfe1a7c892f840efa8.tar.gz
chromium_src-97f4fedbc16a3d1729acb8cfe1a7c892f840efa8.tar.bz2
Reverting 5971.
Review URL: http://codereview.chromium.org/12637 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@5974 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/printing/print_job.cc')
-rw-r--r--chrome/browser/printing/print_job.cc12
1 files changed, 1 insertions, 11 deletions
diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc
index 14a487cd..a2d07fd 100644
--- a/chrome/browser/printing/print_job.cc
+++ b/chrome/browser/printing/print_job.cc
@@ -24,8 +24,6 @@ PrintJob::PrintJob(PrintedPagesSource* source)
is_job_pending_(false),
is_print_dialog_box_shown_(false),
is_canceling_(false) {
- DCHECK(ui_message_loop_);
- ui_message_loop_->AddDestructionObserver(this);
}
PrintJob::PrintJob()
@@ -36,18 +34,14 @@ PrintJob::PrintJob()
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_);
- if (worker_.get())
- DCHECK(worker_->message_loop() == NULL);
+ DCHECK(worker_->message_loop() == NULL);
DCHECK_EQ(ui_message_loop_, MessageLoop::current());
}
@@ -148,10 +142,6 @@ int PrintJob::cookie() const {
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());