Print preview: Handle all tab navigations in PrintPreviewTabController instead of in two places. Ha…

chrome/browser/printing/print_preview_tab_controller.cc

 // Copyright (c) 2012 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 <string>
 #include <vector>
 
@@ skipping 342 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_contents()->GetWebUI()->GetController());
     if (print_preview_ui)
       print_preview_ui->OnPrintPreviewTabClosed();
   }
 
   for (size_t i = 0; i < closed_initiator_tabs.size(); ++i)
-    RemoveInitiatorTab(closed_initiator_tabs[i], false);
+    RemoveInitiatorTab(closed_initiator_tabs[i]);
 }
 
 void PrintPreviewTabController::OnTabContentsDestroyed(TabContents* tab) {
   TabContents* preview_tab = GetPrintPreviewForTab(tab);
   if (!preview_tab) {
     NOTREACHED();
     return;
   }
 
   if (tab == preview_tab)
     RemovePreviewTab(tab);
   else
-    RemoveInitiatorTab(tab, false);
+    RemoveInitiatorTab(tab);
 }
 
 void PrintPreviewTabController::OnNavEntryCommitted(
     TabContents* tab, content::LoadCommittedDetails* details) {
   TabContents* preview_tab = GetPrintPreviewForTab(tab);
   if (!preview_tab) {
     NOTREACHED();
     return;
   }
   bool source_tab_is_preview_tab = (tab == preview_tab);
@@ skipping 19 matching lines @@
           transition_type == content::PAGE_TRANSITION_RELOAD &&
           nav_type == content::NAVIGATION_TYPE_EXISTING_PAGE &&
           IsPrintPreviewURL(details->previous_url)) {
         return;
       }
     }
     NOTREACHED();
     return;
   }
 
-  // Initiator tab navigated.
-  RemoveInitiatorTab(tab, true);
+  RemoveInitiatorTab(tab);
 }
 
 TabContents* PrintPreviewTabController::CreatePrintPreviewTab(
     TabContents* initiator_tab) {
   AutoReset<bool> auto_reset(&is_creating_print_preview_tab_, true);
   WebContents* web_contents = initiator_tab->web_contents();
   Profile* profile =
       Profile::FromBrowserContext(web_contents->GetBrowserContext());
   if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kChromeFrame)) {
     Browser* current_browser = new Browser(
@@ skipping 76 matching lines @@
   content::RenderProcessHost* rph = tab->web_contents()->GetRenderProcessHost();
   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(TabContents* initiator_tab,
-                                                   bool is_navigation) {
+void PrintPreviewTabController::RemoveInitiatorTab(TabContents* initiator_tab) {
   TabContents* 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->print_view_manager()->PrintPreviewDone();
 
   // Initiator tab is closed. Close the print preview tab too.
   PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
       preview_tab->web_contents()->GetWebUI()->GetController());
   if (print_preview_ui)
     print_preview_ui->OnInitiatorTabClosed();
 }
 
 void PrintPreviewTabController::RemovePreviewTab(TabContents* preview_tab) {
   // Remove the initiator tab's observers before erasing the mapping.
   TabContents* initiator_tab = GetInitiatorTab(preview_tab);
   if (initiator_tab) {
     RemoveObservers(initiator_tab);
     initiator_tab->print_view_manager()->PrintPreviewDone();
   }
 
   // Print preview WebContents is destroyed. Notify |PrintPreviewUI| to abort
   // the initiator tab preview request.
   PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(
       preview_tab->web_contents()->GetWebUI()->GetController());
   if (print_preview_ui)
     print_preview_ui->OnTabDestroyed();
 
   preview_tab_map_.erase(preview_tab);
   RemoveObservers(preview_tab);
 }
 
 }  // namespace printing