Print Preview: Properly handle window.print().

chrome/browser/printing/print_preview_tab_controller.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 
 #include <algorithm>
 #include <memory>
 #include <string>
 #include <vector>
@@ skipping 234 matching lines @@
 
   for (size_t i = 0; i < closed_preview_tabs.size(); ++i) {
     RemovePreviewTab(closed_preview_tabs[i]);
     PrintPreviewUI* print_preview_ui =
         static_cast<PrintPreviewUI*>(closed_preview_tabs[i]->web_ui());
     if (print_preview_ui)
       print_preview_ui->OnPrintPreviewTabClosed();
   }
 
   for (size_t i = 0; i < closed_initiator_tabs.size(); ++i)
-    RemoveInitiatorTab(closed_initiator_tabs[i]);
+    RemoveInitiatorTab(closed_initiator_tabs[i], false);
 }
 
 void PrintPreviewTabController::OnTabContentsDestroyed(
     TabContentsWrapper* tab) {
   TabContentsWrapper* preview_tab = GetPrintPreviewForTab(tab);
   if (!preview_tab) {
     NOTREACHED();
     return;
   }
 
   if (tab == preview_tab)
     RemovePreviewTab(tab);
   else
-    RemoveInitiatorTab(tab);
+    RemoveInitiatorTab(tab, false);
 }
 
 void PrintPreviewTabController::OnNavEntryCommitted(
     TabContentsWrapper* tab, content::LoadCommittedDetails* details) {
   TabContentsWrapper* preview_tab = GetPrintPreviewForTab(tab);
   if (!preview_tab) {
     NOTREACHED();
     return;
   }
   bool source_tab_is_preview_tab = (tab == preview_tab);
@@ skipping 23 matching lines @@
           nav_type == content::NAVIGATION_TYPE_EXISTING_PAGE &&
           IsPrintPreviewURL(details->previous_url)) {
         return;
       }
     }
     NOTREACHED();
     return;
   }
 
   // Initiator tab navigated.
-  RemoveInitiatorTab(tab);
+  RemoveInitiatorTab(tab, true);
 }
 
 // static
 bool PrintPreviewTabController::IsPrintPreviewTab(TabContentsWrapper* tab) {
   return IsPrintPreviewURL(tab->tab_contents()->GetURL());
 }
 
 // static
 bool PrintPreviewTabController::IsPrintPreviewURL(const GURL& url) {
   return (url.SchemeIs(chrome::kChromeUIScheme) &&
@@ skipping 105 matching lines @@
   if (registrar_.IsRegistered(this,
                               content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                               content::Source<content::RenderProcessHost>(
                                   rph))) {
     registrar_.Remove(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                       content::Source<content::RenderProcessHost>(rph));
   }
 }
 
 void PrintPreviewTabController::RemoveInitiatorTab(
-    TabContentsWrapper* initiator_tab) {
+    TabContentsWrapper* initiator_tab, bool is_navigation) {
   TabContentsWrapper* preview_tab = GetPrintPreviewForTab(initiator_tab);
   DCHECK(preview_tab);
   // Update the map entry first, so when the print preview tab gets destroyed
   // and reaches RemovePreviewTab(), it does not attempt to also remove the
   // initiator tab's observers.
   preview_tab_map_[preview_tab] = NULL;
   RemoveObservers(initiator_tab);
 
+  // For the navigation case, PrintPreviewDone() has already been called in
+  // PrintPreviewMessageHandler::NavigateToPendingEntry().
+  if (!is_navigation)
+    initiator_tab->print_view_manager()->PrintPreviewDone();
+
   // Initiator tab is closed. Close the print preview tab too.
   PrintPreviewUI* print_preview_ui =
       static_cast<PrintPreviewUI*>(preview_tab->web_ui());
   if (print_preview_ui)
     print_preview_ui->OnInitiatorTabClosed();
 }
 
 void PrintPreviewTabController::RemovePreviewTab(
     TabContentsWrapper* preview_tab) {
   // Remove the initiator tab's observers before erasing the mapping.
   TabContentsWrapper* initiator_tab = GetInitiatorTab(preview_tab);
-  if (initiator_tab)
+  if (initiator_tab) {
     RemoveObservers(initiator_tab);
+    initiator_tab->print_view_manager()->PrintPreviewDone();
+  }
 
   // Print preview TabContents is destroyed. Notify |PrintPreviewUI| to abort
   // the initiator tab preview request.
   PrintPreviewUI* print_preview_ui =
       static_cast<PrintPreviewUI*>(preview_tab->web_ui());
   if (print_preview_ui)
     print_preview_ui->OnTabDestroyed();
 
   preview_tab_map_.erase(preview_tab);
   RemoveObservers(preview_tab);
 }
 
 }  // namespace printing