Print Preview: Make print preview tab modal. (try 2)

chrome/browser/ui/browser.cc

Index: chrome/browser/ui/browser.cc
===================================================================
--- chrome/browser/ui/browser.cc	(revision 110066)
+++ chrome/browser/ui/browser.cc	(working copy)
@@ -69,7 +69,6 @@
 #include "chrome/browser/prefs/incognito_mode_prefs.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prerender/prerender_tab_helper.h"
-#include "chrome/browser/printing/background_printing_manager.h"
 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
 #include "chrome/browser/printing/print_preview_tab_controller.h"
 #include "chrome/browser/printing/print_view_manager.h"
@@ -3552,19 +3551,6 @@
     return;
   }
 
-  // Various sites have a pattern which open a new window with output formatted
-  // for printing, then include a print button, which does window.print();
-  // window.close(); An example is printing Virgin America boarding
-  // pass. Instead of closing, when a print tab is associated with this tab,
-  // tell the BackgroundPrintingManager to own it, which causes it to be
-  // hidden and eventually closed when the print window is closed.
-  TabContentsWrapper* source_wrapper =
-      TabContentsWrapper::GetCurrentWrapperForContents(source);
-  if (g_browser_process->background_printing_manager()->
-          OwnInitiatorTab(source_wrapper)) {
-    return;
-  }
-
   int index = tab_handler_->GetTabStripModel()->GetWrapperIndex(source);
   if (index == TabStripModel::kNoTab) {
     NOTREACHED() << "CloseContents called for tab not in our strip";
@@ -3847,6 +3833,21 @@
 }
 
 void Browser::RendererUnresponsive(TabContents* source) {
+  // Ignore hangs if print preview is open.
+  TabContentsWrapper* source_wrapper =
+      TabContentsWrapper::GetCurrentWrapperForContents(source);
+  if (source_wrapper) {
+    printing::PrintPreviewTabController* controller =
+        printing::PrintPreviewTabController::GetInstance();
+    if (controller) {
+      TabContentsWrapper* preview_tab =
+          controller->GetPrintPreviewForTab(source_wrapper);
+      if (preview_tab && preview_tab != source_wrapper) {
+        return;
+      }
+    }
+  }
+
   browser::ShowHungRendererDialog(source);
 }
 
@@ -4790,9 +4791,8 @@
     // where advanced printing is always enabled.
     printing::PrintPreviewTabController* controller =
         printing::PrintPreviewTabController::GetInstance();
-    if (controller &&
-        wrapper &&
-        wrapper == controller->GetPrintPreviewForTab(wrapper)) {
+    if (controller && (controller->GetPrintPreviewForTab(wrapper) ||

[Lei Zhang, 2011/11/15 11:40:34]

It turns out the code removed in
http://codereview.chromium.org/8136027/diff2/95004:99007/chrome/browser/print...
did do something - it made PrintPreviewUITest.PrintCommands pass by calling
UpdatePrintingState() one more time.

The problem here is we are calling GetPrintPreviewForTab() right before the new
tab has been created. Thus the need for the next line below. Otherwise we'd have
to resort to hacks like
tab->SetContentRestrictions(tab->content_restrictions()).

+                       controller->is_creating_print_preview_tab())) {
       advanced_print_enabled = true;
     }
   }