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 417 matching lines @@
 void PrintPreviewTabController::RemoveInitiatorTab(
     TabContentsWrapper* initiator_tab) {
   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);
 
+  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