diff options
author | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-02-06 12:45:32 +0100 |
---|---|---|
committer | Oswald Buddenhagen <oswald.buddenhagen@qt.io> | 2018-02-06 12:45:32 +0100 |
commit | 9225efb8f8ff0ee75b132b16d93d5c9368b43de8 (patch) | |
tree | 2a7fdf716947fe631195eab30af1fe446ae20e29 /src/core/print_view_manager_base_qt.h | |
parent | dff5f546d13422dd3f6772baed42c4061be2732a (diff) | |
parent | f52737f60e505101d2364cd6f3713ea8303f30f0 (diff) |
Merge dev into 5.11
Change-Id: Iaa5a467096e4915bbb5a7b0486fb08101af3749e
Diffstat (limited to 'src/core/print_view_manager_base_qt.h')
-rw-r--r-- | src/core/print_view_manager_base_qt.h | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/src/core/print_view_manager_base_qt.h b/src/core/print_view_manager_base_qt.h index 4e4c8bde2..c55e970e5 100644 --- a/src/core/print_view_manager_base_qt.h +++ b/src/core/print_view_manager_base_qt.h @@ -50,11 +50,11 @@ #include "components/printing/browser/print_manager.h" #include "content/public/browser/notification_observer.h" #include "content/public/browser/notification_registrar.h" -#include "printing/printed_pages_source.h" struct PrintHostMsg_DidPrintPage_Params; namespace content { +class RenderFrameHost; class RenderViewHost; } @@ -70,7 +70,6 @@ namespace QtWebEngineCore { class PrintViewManagerBaseQt : public content::NotificationObserver , public printing::PrintManager - , public printing::PrintedPagesSource { public: ~PrintViewManagerBaseQt() override; @@ -78,8 +77,7 @@ public: // Whether printing is enabled or not. void UpdatePrintingEnabled(); - // PrintedPagesSource implementation. - base::string16 RenderSourceName() override; + virtual base::string16 RenderSourceName(); protected: explicit PrintViewManagerBaseQt(content::WebContents*); @@ -88,10 +86,8 @@ protected: // Cancels the print job. void NavigationStopped() override; - // Terminates or cancels the print job if one was pending. - void RenderProcessGone(base::TerminationStatus status) override; - // content::WebContentsObserver implementation. + void RenderFrameDeleted(content::RenderFrameHost* render_frame_host) override; bool OnMessageReceived(const IPC::Message& message, content::RenderFrameHost* render_frame_host) override; @@ -132,7 +128,6 @@ protected: bool RunInnerMessageLoop(); void TerminatePrintJob(bool cancel); - void PrintingDone(bool success); void DisconnectFromCurrentPrintJob(); bool CreateNewPrintJob(printing::PrintJobWorkerOwner* job); |