PrintPreview: Preview generation should not block print button.

chrome/browser/ui/webui/print_preview_handler.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/ui/webui/print_preview_handler.h"
 
 #include <string>
 
 #include "base/i18n/file_util_icu.h"
 #include "base/json/json_reader.h"
@@ skipping 356 matching lines @@
   web_ui_->RegisterMessageCallback("print",
       NewCallback(this, &PrintPreviewHandler::HandlePrint));
   web_ui_->RegisterMessageCallback("getPrinterCapabilities",
       NewCallback(this, &PrintPreviewHandler::HandleGetPrinterCapabilities));
   web_ui_->RegisterMessageCallback("showSystemDialog",
       NewCallback(this, &PrintPreviewHandler::HandleShowSystemDialog));
   web_ui_->RegisterMessageCallback("managePrinters",
       NewCallback(this, &PrintPreviewHandler::HandleManagePrinters));
   web_ui_->RegisterMessageCallback("closePrintPreviewTab",
       NewCallback(this, &PrintPreviewHandler::HandleClosePreviewTab));
+  web_ui_->RegisterMessageCallback("hidePreview",
+      NewCallback(this, &PrintPreviewHandler::HandleHidePreview));
 }
 
 TabContents* PrintPreviewHandler::preview_tab() {
   return web_ui_->tab_contents();
 }
 
 void PrintPreviewHandler::HandleGetDefaultPrinter(const ListValue*) {
   scoped_refptr<PrintSystemTaskProxy> task =
       new PrintSystemTaskProxy(AsWeakPtr(),
                                print_backend_.get(),
@@ skipping 40 matching lines @@
 }
 
 void PrintPreviewHandler::HandlePrint(const ListValue* args) {
   ReportStats();
 
   // Record the number of times the user requests to regenerate preview data
   // before printing.
   UMA_HISTOGRAM_COUNTS("PrintPreview.RegeneratePreviewRequest.BeforePrint",
                        regenerate_preview_request_count_);
 
-  TabContents* initiator_tab = GetInitiatorTab();

[Lei Zhang, 2011/06/09 09:54:55]

Why did you move this code?

[kmadhusu, 2011/06/09 18:11:44]

oops. My bad. Reverted this change.

-  if (initiator_tab) {
-    RenderViewHost* rvh = initiator_tab->render_view_host();
-    rvh->Send(new PrintMsg_ResetScriptedPrintCount(rvh->routing_id()));
-  }
-
   scoped_ptr<DictionaryValue> settings(GetSettingsDictionary(args));
   if (!settings.get())
     return;
 
   // Initializing last_used_printer_ if it is not already initialized.
   if (!last_used_printer_)
     last_used_printer_ = new std::string();
   // Storing last used printer.
   settings->GetString("deviceName", last_used_printer_);
 
@@ skipping 18 matching lines @@
     FilePath::StringType print_job_title = UTF16ToUTF8(print_job_title_utf16);
 #endif
 
     file_util::ReplaceIllegalCharactersInPath(&print_job_title, '_');
     FilePath default_filename(print_job_title);
     default_filename =
         default_filename.ReplaceExtension(FILE_PATH_LITERAL("pdf"));
 
     SelectFile(default_filename);
   } else {
+    ClearInitiatorTabDetails();
     ReportPrintSettingsStats(*settings);
     ReportUserActionHistogram(PRINT_TO_PRINTER);
     UMA_HISTOGRAM_COUNTS("PrintPreview.PageCount.PrintToPrinter",
                          GetPageCountFromSettingsDictionary(*settings));
-    g_browser_process->background_printing_manager()->OwnTabContents(
-        preview_tab_wrapper);
+
+    HidePreviewTab();
 
     // The PDF being printed contains only the pages that the user selected,
     // so ignore the page range and print all pages.
     settings->Remove(printing::kSettingPageRange, NULL);
     RenderViewHost* rvh = web_ui_->GetRenderViewHost();
     rvh->Send(new PrintMsg_PrintForPrintPreview(rvh->routing_id(), *settings));
   }
 }
 
+void PrintPreviewHandler::HandleHidePreview(const ListValue* args) {
+  HidePreviewTab();
+}
+
 void PrintPreviewHandler::HandleGetPrinterCapabilities(
     const ListValue* args) {
   std::string printer_name;
   bool ret = args->GetString(0, &printer_name);
   if (!ret || printer_name.empty())
     return;
 
   scoped_refptr<PrintSystemTaskProxy> task =
       new PrintSystemTaskProxy(AsWeakPtr(),
                                print_backend_.get(),
@@ skipping 132 matching lines @@
   metafile->InitFromData(static_cast<const void*>(data->front()), data->size());
 
   // Updating last_saved_path_ to the newly selected folder.
   *last_saved_path_ = path.DirName();
 
   PrintToPdfTask* task = new PrintToPdfTask(metafile, path);
   BrowserThread::PostTask(BrowserThread::FILE, FROM_HERE, task);
 
   ActivateInitiatorTabAndClosePreviewTab();
 }
+
+void PrintPreviewHandler::HidePreviewTab() {
+  PrintPreviewUI* print_preview_ui = static_cast<PrintPreviewUI*>(web_ui_);
+  if (print_preview_ui->isHidden())
+    return;
+
+  TabContentsWrapper* preview_tab_wrapper =
+      TabContentsWrapper::GetCurrentWrapperForContents(preview_tab());
+  g_browser_process->background_printing_manager()->OwnTabContents(
+      preview_tab_wrapper);
+  print_preview_ui->setTabHiddenForPrint();
+}
+
+void PrintPreviewHandler::ClearInitiatorTabDetails() {
+  TabContents* initiator_tab = GetInitiatorTab();
+  if (initiator_tab) {
+    RenderViewHost* rvh = initiator_tab->render_view_host();
+    rvh->Send(new PrintMsg_ResetScriptedPrintCount(rvh->routing_id()));
+
+    // Remove initiator tab association with the preview tab.

[Lei Zhang, 2011/06/09 09:54:55]

You should mention why we do this here.

[kmadhusu, 2011/06/09 18:11:44]

Done.

+    printing::PrintPreviewTabController* tab_controller =
+       printing::PrintPreviewTabController::GetInstance();
+    if (tab_controller)
+      tab_controller->EraseInitiatorTabInfo(preview_tab());
+  }
+}