diff options
Diffstat (limited to 'src/core/printing')
-rw-r--r-- | src/core/printing/print_view_manager_base_qt.cpp | 6 | ||||
-rw-r--r-- | src/core/printing/print_view_manager_base_qt.h | 2 | ||||
-rw-r--r-- | src/core/printing/print_view_manager_qt.cpp | 4 | ||||
-rw-r--r-- | src/core/printing/print_view_manager_qt.h | 3 |
4 files changed, 4 insertions, 11 deletions
diff --git a/src/core/printing/print_view_manager_base_qt.cpp b/src/core/printing/print_view_manager_base_qt.cpp index 271dc0041..cfe9b5ce9 100644 --- a/src/core/printing/print_view_manager_base_qt.cpp +++ b/src/core/printing/print_view_manager_base_qt.cpp @@ -49,7 +49,6 @@ #include "base/memory/ref_counted_memory.h" #include "base/run_loop.h" -#include "base/single_thread_task_runner.h" #include "base/task/current_thread.h" #include "base/task/post_task.h" #include "base/timer/timer.h" @@ -464,9 +463,6 @@ void PrintViewManagerBaseQt::OnNotifyPrintJobEvent(const printing::JobEventDetai // break; // } case printing::JobEventDetails::NEW_DOC: -#if defined(OS_WIN) - case printing::JobEventDetails::PAGE_DONE: -#endif case printing::JobEventDetails::DOC_DONE: { // Don't care about the actual printing process. break; @@ -635,7 +631,7 @@ bool PrintViewManagerBaseQt::RunInnerMessageLoop() base::OneShotTimer quit_timer; base::RunLoop run_loop; quit_timer.Start(FROM_HERE, - base::TimeDelta::FromMilliseconds(kPrinterSettingsTimeout), + base::Milliseconds(kPrinterSettingsTimeout), run_loop.QuitWhenIdleClosure()); m_quitInnerLoop = run_loop.QuitClosure(); diff --git a/src/core/printing/print_view_manager_base_qt.h b/src/core/printing/print_view_manager_base_qt.h index 96c2d441c..f3134832e 100644 --- a/src/core/printing/print_view_manager_base_qt.h +++ b/src/core/printing/print_view_manager_base_qt.h @@ -183,8 +183,6 @@ private: // rendered or the print settings are being loaded. base::OnceClosure m_quitInnerLoop; scoped_refptr<printing::PrintQueriesQueue> m_printerQueriesQueue; - - DISALLOW_COPY_AND_ASSIGN(PrintViewManagerBaseQt); }; } // namespace QtWebEngineCore diff --git a/src/core/printing/print_view_manager_qt.cpp b/src/core/printing/print_view_manager_qt.cpp index a044c918e..7eace04f5 100644 --- a/src/core/printing/print_view_manager_qt.cpp +++ b/src/core/printing/print_view_manager_qt.cpp @@ -331,9 +331,9 @@ void PrintViewManagerQt::NavigationStopped() PrintViewManagerBaseQt::NavigationStopped(); } -void PrintViewManagerQt::RenderProcessGone(base::TerminationStatus status) +void PrintViewManagerQt::PrimaryMainFrameRenderProcessGone(base::TerminationStatus status) { - PrintViewManagerBaseQt::RenderProcessGone(status); + PrintViewManagerBaseQt::PrimaryMainFrameRenderProcessGone(status); if (!m_pdfPrintCallback.is_null()) { base::PostTask(FROM_HERE, {content::BrowserThread::UI}, base::BindOnce(std::move(m_pdfPrintCallback), QSharedPointer<QByteArray>())); diff --git a/src/core/printing/print_view_manager_qt.h b/src/core/printing/print_view_manager_qt.h index bc55c57fe..49ccd8164 100644 --- a/src/core/printing/print_view_manager_qt.h +++ b/src/core/printing/print_view_manager_qt.h @@ -98,7 +98,7 @@ protected: void NavigationStopped() override; // Terminates or cancels the print job if one was pending. - void RenderProcessGone(base::TerminationStatus status) override; + void PrimaryMainFrameRenderProcessGone(base::TerminationStatus status) override; void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override; @@ -126,7 +126,6 @@ private: std::unique_ptr<base::DictionaryValue> m_printSettings; friend class content::WebContentsUserData<PrintViewManagerQt>; - DISALLOW_COPY_AND_ASSIGN(PrintViewManagerQt); }; } // namespace QtWebEngineCore |