Print Preview: Display a throbber when the user requests the system print

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 534 matching lines @@
                         printer_name));
 }
 
 void PrintPreviewHandler::HandleShowSystemDialog(const ListValue* args) {
   ReportStats();
   ReportUserActionHistogram(FALLBACK_TO_ADVANCED_SETTINGS_DIALOG);
 
   TabContents* initiator_tab = GetInitiatorTab();
   if (!initiator_tab)
     return;
-  initiator_tab->Activate();
 
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(initiator_tab);
-  wrapper->print_view_manager()->PrintNow();
-
-  ClosePrintPreviewTab();
+  wrapper->print_view_manager()->PrintNow(this);
 }
 
 void PrintPreviewHandler::HandleManagePrinters(const ListValue* args) {
   ++manage_printers_dialog_request_count_;
   printing::PrinterManagerDialog::ShowPrinterManagerDialog();
 }
 
 void PrintPreviewHandler::HandleClosePreviewTab(const ListValue* args) {
   ReportStats();
   ReportUserActionHistogram(CANCEL);
@@ skipping 52 matching lines @@
   if (!preview_tab_browser)
     return;
   TabStripModel* tabstrip = preview_tab_browser->tabstrip_model();
 
   // Keep print preview tab out of the recently closed tab list, because
   // re-opening that page will just display a non-functional print preview page.
   tabstrip->CloseTabContentsAt(tabstrip->GetIndexOfController(
       &preview_tab()->controller()), TabStripModel::CLOSE_NONE);
 }
 
+void PrintPreviewHandler::OnPrintDialogShown() {
+  TabContents* initiator_tab = GetInitiatorTab();
+  if (!initiator_tab)

[Lei Zhang, 2011/06/21 01:54:46]

FWIW, I don't think is can happen.

[James Hawkins, 2011/06/22 23:47:24]

It can (just tested).

[Lei Zhang, 2011/06/23 17:08:45]

How?

[James Hawkins, 2011/06/27 21:58:17]

Just tested again and it's now not possible, though I don't know what
necessarily changed. Made this a DCHECK.

+    return;
+
+  initiator_tab->Activate();
+  ClosePrintPreviewTab();
+}
+
 void PrintPreviewHandler::SelectFile(const FilePath& default_filename) {
   SelectFileDialog::FileTypeInfo file_type_info;
   file_type_info.extensions.resize(1);
   file_type_info.extensions[0].push_back(FILE_PATH_LITERAL("pdf"));
 
   // Initializing last_saved_path_ if it is not already initialized.
   if (!last_saved_path_) {
     last_saved_path_ = new FilePath();
     // Allowing IO operation temporarily. It is ok to do so here because
     // the select file dialog performs IO anyway in order to display the
@@ skipping 57 matching lines @@
   if (initiator_tab) {
     // We no longer require the intiator tab details. Remove those details
     // associated with the preview tab to allow the initiator tab to create
     // another preview tab.
     printing::PrintPreviewTabController* tab_controller =
        printing::PrintPreviewTabController::GetInstance();
     if (tab_controller)
       tab_controller->EraseInitiatorTabInfo(preview_tab());
   }
 }