| Index: chrome/browser/printing/print_view_manager.cc
|
| ===================================================================
|
| --- chrome/browser/printing/print_view_manager.cc (revision 126455)
|
| +++ chrome/browser/printing/print_view_manager.cc (working copy)
|
| @@ -135,8 +135,7 @@
|
| void PrintViewManager::PreviewPrintingRequestCancelled() {
|
| if (!web_contents())
|
| return;
|
| - RenderViewHost* rvh = web_contents()->GetRenderViewHost();
|
| - rvh->Send(new PrintMsg_PreviewPrintingRequestCancelled(rvh->GetRoutingID()));
|
| + Send(new PrintMsg_PreviewPrintingRequestCancelled(routing_id()));
|
| }
|
|
|
| void PrintViewManager::set_observer(PrintViewManagerObserver* observer) {
|
| @@ -486,10 +485,9 @@
|
| }
|
|
|
| void PrintViewManager::PrintingDone(bool success) {
|
| - if (!print_job_.get() || !web_contents())
|
| + if (!print_job_.get())
|
| return;
|
| - RenderViewHost* rvh = web_contents()->GetRenderViewHost();
|
| - rvh->Send(new PrintMsg_PrintingDone(rvh->GetRoutingID(), success));
|
| + Send(new PrintMsg_PrintingDone(routing_id(), success));
|
| }
|
|
|
| void PrintViewManager::TerminatePrintJob(bool cancel) {
|
| @@ -593,8 +591,10 @@
|
|
|
| bool PrintViewManager::PrintNowInternal(IPC::Message* message) {
|
| // Don't print / print preview interstitials.
|
| - if (web_contents()->ShowingInterstitialPage())
|
| + if (web_contents()->ShowingInterstitialPage()) {
|
| + delete message;
|
| return false;
|
| + }
|
| return Send(message);
|
| }
|
|
|
|
|