Be able to print items that do window.print(); window.close() (airline tix e.g.)

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 <vector>
 
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile.h"
+#include "chrome/browser/printing/background_printing_manager.h"

[Lei Zhang, 2011/08/26 10:01:54]

nit: alphabetical order

[Sheridan Rawlins, 2011/08/26 23:45:39]

Done.

 #include "chrome/browser/sessions/restore_tab_helper.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/browser/ui/webui/print_preview_ui.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/url_constants.h"
@@ skipping 128 matching lines @@
     }
   }
 }
 
 void PrintPreviewTabController::OnRendererProcessClosed(
     RenderProcessHost* rph) {
   for (PrintPreviewTabMap::iterator iter = preview_tab_map_.begin();
        iter != preview_tab_map_.end(); ++iter) {
     if (iter->second != NULL &&
         iter->second->render_view_host()->process() == rph) {
-      TabContents* preview_tab = GetPrintPreviewForTab(iter->second);
+      TabContents* initiator_tab = iter->second;

[Lei Zhang, 2011/08/26 10:01:54]

move this up to between line 159/160 and then you can also make the if statement
more readable.

[Sheridan Rawlins, 2011/08/26 23:45:39]

Done.

+      // Release the initiator tab contents, possibly deleting if owned.
+      if (initiator_tab) {

[Lei Zhang, 2011/08/26 10:01:54]

this will always be true, we already tested this condition on line 160.

[Sheridan Rawlins, 2011/08/26 23:45:39]

Yeah, the previous comment made this obvious :)

Done.

On 2011/08/26 10:01:54, Lei Zhang wrote:

+        RemoveObservers(initiator_tab);
+        TabContentsWrapper* initiator_wrapper =
+            TabContentsWrapper::GetCurrentWrapperForContents(initiator_tab);
+        g_browser_process->background_printing_manager()->
+            ReleaseInitiatorTabContents(initiator_wrapper);
+      }
+      TabContents* preview_tab = GetPrintPreviewForTab(initiator_tab);
       PrintPreviewUI* print_preview_ui =
           static_cast<PrintPreviewUI*>(preview_tab->web_ui());
       print_preview_ui->OnInitiatorTabCrashed();
     }
   }
 }
 
 void PrintPreviewTabController::OnTabContentsDestroyed(TabContents* tab) {
   TabContents* preview_tab = GetPrintPreviewForTab(tab);
   if (!preview_tab)
     return;
 
   if (tab == preview_tab) {
-    // Remove the initiator tab's observers before erasing the mapping.
-    TabContents* initiator_tab = GetInitiatorTab(tab);
-    if (initiator_tab)
-      RemoveObservers(initiator_tab);
-
     // Print preview tab contents are destroyed. Notify |PrintPreviewUI| to
     // abort the initiator tab preview request.
     if (IsPrintPreviewTab(tab) && tab->web_ui()) {
       PrintPreviewUI* print_preview_ui =
           static_cast<PrintPreviewUI*>(tab->web_ui());
       print_preview_ui->OnTabDestroyed();
     }
 
+    // Remove the initiator tab's observers before erasing the mapping. Also
+    // release the initiator tab contents, possibly deleting if owned.
+    TabContents* initiator_tab = GetInitiatorTab(tab);
+    if (initiator_tab) {
+      RemoveObservers(initiator_tab);
+      TabContentsWrapper* initiator_wrapper =
+          TabContentsWrapper::GetCurrentWrapperForContents(initiator_tab);
+      g_browser_process->background_printing_manager()->
+          ReleaseInitiatorTabContents(initiator_wrapper);
+    }
     // Erase the map entry.
     preview_tab_map_.erase(tab);
   } else {
     // Initiator tab is closed. Disable the controls in preview tab.
     if (preview_tab->web_ui()) {
       PrintPreviewUI* print_preview_ui =
           static_cast<PrintPreviewUI*>(preview_tab->web_ui());
       print_preview_ui->OnInitiatorTabClosed();
     }
 
@@ skipping 43 matching lines @@
         transition_type == PageTransition::FORWARD_BACK &&
         nav_type == NavigationType::EXISTING_PAGE) {
       return;
     }
   }
 
   RemoveObservers(tab);
   if (source_tab_is_preview_tab) {
     // Remove the initiator tab's observers before erasing the mapping.
     TabContents* initiator_tab = GetInitiatorTab(tab);
-    if (initiator_tab)
+    if (initiator_tab) {
       RemoveObservers(initiator_tab);
+      TabContentsWrapper* initiator_wrapper =
+          TabContentsWrapper::GetCurrentWrapperForContents(initiator_tab);
+      g_browser_process->background_printing_manager()->
+          ReleaseInitiatorTabContents(initiator_wrapper);
+    }
     preview_tab_map_.erase(tab);
   } else {
     preview_tab_map_[preview_tab] = NULL;
 
     // Initiator tab is closed. Disable the controls in preview tab.
     if (preview_tab->web_ui()) {
       PrintPreviewUI* print_preview_ui =
           static_cast<PrintPreviewUI*>(preview_tab->web_ui());
       print_preview_ui->OnInitiatorTabClosed();
     }
@@ skipping 99 matching lines @@
   RenderProcessHost* rph = tab->render_view_host()->process();
   if (registrar_.IsRegistered(this,
                               content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                               Source<RenderProcessHost>(rph))) {
     registrar_.Remove(this, content::NOTIFICATION_RENDERER_PROCESS_CLOSED,
                       Source<RenderProcessHost>(rph));
   }
 }
 
 }  // namespace printing