summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/browser/printing/print_job.cc17
-rw-r--r--chrome/browser/printing/print_job.h6
-rw-r--r--chrome/browser/printing/print_job_unittest.cc1
-rw-r--r--chrome/browser/printing/print_job_worker.cc4
-rw-r--r--chrome/browser/printing/print_job_worker.h3
-rw-r--r--chrome/browser/printing/printer_query.cc4
-rw-r--r--chrome/browser/printing/printer_query.h3
-rw-r--r--printing/printing_context.h3
-rw-r--r--printing/printing_context_cairo.cc4
-rw-r--r--printing/printing_context_cairo.h1
-rw-r--r--printing/printing_context_mac.h1
-rw-r--r--printing/printing_context_mac.mm4
-rw-r--r--printing/printing_context_win.cc4
-rw-r--r--printing/printing_context_win.h1
14 files changed, 0 insertions, 56 deletions
diff --git a/chrome/browser/printing/print_job.cc b/chrome/browser/printing/print_job.cc
index cf49f78..dc14abb 100644
--- a/chrome/browser/printing/print_job.cc
+++ b/chrome/browser/printing/print_job.cc
@@ -22,7 +22,6 @@ PrintJob::PrintJob()
worker_(),
settings_(),
is_job_pending_(false),
- is_print_dialog_box_shown_(false),
is_canceling_(false) {
DCHECK(ui_message_loop_);
// This is normally a UI message loop, but in unit tests, the message loop is
@@ -36,7 +35,6 @@ 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);
@@ -49,7 +47,6 @@ void PrintJob::Initialize(PrintJobWorkerOwner* job,
DCHECK(!source_);
DCHECK(!worker_.get());
DCHECK(!is_job_pending_);
- DCHECK(!is_print_dialog_box_shown_);
DCHECK(!is_canceling_);
DCHECK(!document_.get());
source_ = source;
@@ -114,7 +111,6 @@ void PrintJob::StartPrinting() {
DCHECK_EQ(ui_message_loop_, MessageLoop::current());
DCHECK(worker_->message_loop());
DCHECK(!is_job_pending_);
- DCHECK(!is_print_dialog_box_shown_);
if (!worker_->message_loop() || is_job_pending_)
return;
@@ -141,13 +137,6 @@ void PrintJob::Stop() {
MessageLoop* worker_loop = worker_->message_loop();
if (worker_loop) {
- if (is_print_dialog_box_shown_) {
- // Make sure there is no Print... dialog box.
- worker_loop->PostTask(FROM_HERE, NewRunnableMethod(
- worker_.get(), &PrintJobWorker::DismissDialog));
- is_print_dialog_box_shown_ = false;
- }
-
ControlledWorkerShutdown();
is_job_pending_ = false;
@@ -216,10 +205,6 @@ bool PrintJob::is_job_pending() const {
return is_job_pending_;
}
-bool PrintJob::is_print_dialog_box_shown() const {
- return is_print_dialog_box_shown_;
-}
-
PrintedDocument* PrintJob::document() const {
return document_.get();
}
@@ -246,8 +231,6 @@ void PrintJob::OnNotifyPrintJobEvent(const JobEventDetails& event_details) {
switch (event_details.type()) {
case JobEventDetails::FAILED: {
settings_.Clear();
- // Update internal state.
- is_print_dialog_box_shown_ = false;
// No need to cancel since the worker already canceled itself.
Stop();
break;
diff --git a/chrome/browser/printing/print_job.h b/chrome/browser/printing/print_job.h
index 8468828..9191208 100644
--- a/chrome/browser/printing/print_job.h
+++ b/chrome/browser/printing/print_job.h
@@ -88,9 +88,6 @@ class PrintJob : public PrintJobWorkerOwner,
// and the end of the spooling.
bool is_job_pending() const;
- // Returns true if the Print... dialog box is currently displayed.
- bool is_print_dialog_box_shown() const;
-
// Access the current printed document. Warning: may be NULL.
PrintedDocument* document() const;
@@ -136,9 +133,6 @@ class PrintJob : public PrintJobWorkerOwner,
// Is the worker thread printing.
bool is_job_pending_;
- // Is the Print... dialog box currently shown.
- bool is_print_dialog_box_shown_;
-
// Is Canceling? If so, try to not cause recursion if on FAILED notification,
// the notified calls Cancel() again.
bool is_canceling_;
diff --git a/chrome/browser/printing/print_job_unittest.cc b/chrome/browser/printing/print_job_unittest.cc
index bdd8dd0..e5142ac 100644
--- a/chrome/browser/printing/print_job_unittest.cc
+++ b/chrome/browser/printing/print_job_unittest.cc
@@ -135,7 +135,6 @@ TEST(PrintJobTest, SimplePrintLateInit) {
job->FlushJob(timeout_ms);
job->DisconnectSource();
job->is_job_pending();
- job->is_print_dialog_box_shown();
job->document();
// Private
job->UpdatePrintedDocument(NULL);
diff --git a/chrome/browser/printing/print_job_worker.cc b/chrome/browser/printing/print_job_worker.cc
index 201b2f7..50a1a18 100644
--- a/chrome/browser/printing/print_job_worker.cc
+++ b/chrome/browser/printing/print_job_worker.cc
@@ -223,10 +223,6 @@ void PrintJobWorker::Cancel() {
// context we run.
}
-void PrintJobWorker::DismissDialog() {
- printing_context_->DismissDialog();
-}
-
void PrintJobWorker::OnDocumentDone() {
DCHECK_EQ(message_loop(), MessageLoop::current());
DCHECK_EQ(page_number_, PageNumber::npos());
diff --git a/chrome/browser/printing/print_job_worker.h b/chrome/browser/printing/print_job_worker.h
index 30ac69f..6b0183b 100644
--- a/chrome/browser/printing/print_job_worker.h
+++ b/chrome/browser/printing/print_job_worker.h
@@ -57,9 +57,6 @@ class PrintJobWorker : public base::Thread {
// This is the only function that can be called in a thread.
void Cancel();
- // Cancels the Print... dialog box if shown, noop otherwise.
- void DismissDialog();
-
protected:
// Retrieves the context for testing only.
PrintingContext* printing_context() { return printing_context_.get(); }
diff --git a/chrome/browser/printing/printer_query.cc b/chrome/browser/printing/printer_query.cc
index 89f0e97..f39960f 100644
--- a/chrome/browser/printing/printer_query.cc
+++ b/chrome/browser/printing/printer_query.cc
@@ -118,10 +118,6 @@ void PrinterQuery::StopWorker() {
}
}
-bool PrinterQuery::is_print_dialog_box_shown() const {
- return is_print_dialog_box_shown_;
-}
-
bool PrinterQuery::is_callback_pending() const {
return callback_.get() != NULL;
}
diff --git a/chrome/browser/printing/printer_query.h b/chrome/browser/printing/printer_query.h
index 9f9ff20..edc0c63 100644
--- a/chrome/browser/printing/printer_query.h
+++ b/chrome/browser/printing/printer_query.h
@@ -54,9 +54,6 @@ class PrinterQuery : public PrintJobWorkerOwner {
// Stops the worker thread since the client is done with this object.
void StopWorker();
- // Returns true if the Print... dialog box is currently displayed.
- bool is_print_dialog_box_shown() const;
-
// Returns true if a GetSettings() call is pending completion.
bool is_callback_pending() const;
diff --git a/printing/printing_context.h b/printing/printing_context.h
index 353c36d..6d51f02 100644
--- a/printing/printing_context.h
+++ b/printing/printing_context.h
@@ -72,9 +72,6 @@ class PrintingContext {
// immediately.
virtual void Cancel() = 0;
- // Dismiss the Print... dialog box if shown.
- virtual void DismissDialog() = 0;
-
// Releases the native printing context.
virtual void ReleaseContext() = 0;
diff --git a/printing/printing_context_cairo.cc b/printing/printing_context_cairo.cc
index 5f9f884..5976878 100644
--- a/printing/printing_context_cairo.cc
+++ b/printing/printing_context_cairo.cc
@@ -158,10 +158,6 @@ void PrintingContextCairo::Cancel() {
NOTIMPLEMENTED();
}
-void PrintingContextCairo::DismissDialog() {
- NOTIMPLEMENTED();
-}
-
void PrintingContextCairo::ReleaseContext() {
// Nothing to do yet.
}
diff --git a/printing/printing_context_cairo.h b/printing/printing_context_cairo.h
index c5a8fa8..ac42239 100644
--- a/printing/printing_context_cairo.h
+++ b/printing/printing_context_cairo.h
@@ -28,7 +28,6 @@ class PrintingContextCairo : public PrintingContext {
virtual Result PageDone();
virtual Result DocumentDone();
virtual void Cancel();
- virtual void DismissDialog();
virtual void ReleaseContext();
virtual gfx::NativeDrawingContext context() const;
diff --git a/printing/printing_context_mac.h b/printing/printing_context_mac.h
index 49ba983..8f6bf34 100644
--- a/printing/printing_context_mac.h
+++ b/printing/printing_context_mac.h
@@ -34,7 +34,6 @@ class PrintingContextMac : public PrintingContext {
virtual Result PageDone();
virtual Result DocumentDone();
virtual void Cancel();
- virtual void DismissDialog();
virtual void ReleaseContext();
virtual gfx::NativeDrawingContext context() const;
diff --git a/printing/printing_context_mac.mm b/printing/printing_context_mac.mm
index 466c59b..1826c49 100644
--- a/printing/printing_context_mac.mm
+++ b/printing/printing_context_mac.mm
@@ -201,10 +201,6 @@ void PrintingContextMac::Cancel() {
PMSessionEndPageNoDialog(print_session);
}
-void PrintingContextMac::DismissDialog() {
- NOTIMPLEMENTED();
-}
-
void PrintingContextMac::ReleaseContext() {
if (print_info_) {
[print_info_ autorelease];
diff --git a/printing/printing_context_win.cc b/printing/printing_context_win.cc
index c5130c0..3d40739 100644
--- a/printing/printing_context_win.cc
+++ b/printing/printing_context_win.cc
@@ -327,10 +327,6 @@ void PrintingContextWin::Cancel() {
in_print_job_ = false;
if (context_)
CancelDC(context_);
- DismissDialog();
-}
-
-void PrintingContextWin::DismissDialog() {
if (dialog_box_) {
DestroyWindow(dialog_box_);
dialog_box_dismissed_ = true;
diff --git a/printing/printing_context_win.h b/printing/printing_context_win.h
index 361fbe6..d42bf97 100644
--- a/printing/printing_context_win.h
+++ b/printing/printing_context_win.h
@@ -34,7 +34,6 @@ class PrintingContextWin : public PrintingContext {
virtual Result PageDone();
virtual Result DocumentDone();
virtual void Cancel();
- virtual void DismissDialog();
virtual void ReleaseContext();
virtual gfx::NativeDrawingContext context() const;
generated by cgit v1.1 at 2025-03-26 19:58:50 +0000