Print Preview: close dialog when system dialog is open (Win)

chrome/browser/ui/webui/print_preview/print_preview_handler.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/ui/webui/print_preview/print_preview_handler.h"
 
 #include <ctype.h>
 #include <stddef.h>
 
 #include <map>
@@ skipping 1017 matching lines @@
     auto* main_render_frame = initiator->GetMainFrame();
     settings->SetInteger(printing::kPreviewInitiatorHostId,
                          main_render_frame->GetProcess()->GetID());
     settings->SetInteger(printing::kPreviewInitiatorRoutingId,
                          main_render_frame->GetRoutingID());
   }
 
   // Set ID to know whether printing is for preview.
   settings->SetInteger(printing::kPreviewUIID,
                        print_preview_ui()->GetIDForPrintPreviewUI());
-  RenderFrameHost* rfh = preview_web_contents()->GetMainFrame();
-  rfh->Send(new PrintMsg_PrintForPrintPreview(rfh->GetRoutingID(), *settings));
 
-  // Set this so when print preview sends "hidePreviewDialog" we clear the
-  // initiator and call PrintPreviewDone(). In the cases above, the preview
-  // dialog stays open until printing is finished and we do this when the
-  // dialog is closed. In this case, we set this so that these tasks are
-  // done in HandleHidePreview().
-  printing_started_ = true;
-
-  // This will ultimately try to activate the initiator as well, so do not
-  // clear the association with the initiator until "hidePreviewDialog" is
-  // received from JS.
+  // Save the settings and notify print preview. Print preview will respond
+  // with a "hidePreviewDialog" message, and then the message can be sent to
+  // the renderer.

[Lei Zhang, 2017/06/27 21:58:48]

for additional context:

the renderer in HandleHidePreview().

[rbpotter, 2017/06/28 00:18:58]

Done.

+  settings_ = std::move(settings);
   ResolveJavascriptCallback(base::Value(callback_id), base::Value());
 
 #else
   NOTREACHED();
 #endif   // BUILDFLAG(ENABLE_BASIC_PRINTING)
 }
 
 void PrintPreviewHandler::PrintToPdf() {
   if (!print_to_pdf_path_.empty()) {
     // User has already selected a path, no need to show the dialog again.
@@ skipping 19 matching lines @@
     default_filename =
         default_filename.ReplaceExtension(FILE_PATH_LITERAL("pdf"));
 
     base::CommandLine* cmdline = base::CommandLine::ForCurrentProcess();
     bool prompt_user = !cmdline->HasSwitch(switches::kKioskModePrinting);
     SelectFile(default_filename, prompt_user);
   }
 }
 
 void PrintPreviewHandler::HandleHidePreview(const base::ListValue* /*args*/) {
-  if (printing_started_) {
-    // Printing has started, so clear the initiator so that it can open a new
-    // print preview dialog, while the current print preview dialog is still
-    // handling its print job.
+  if (settings_) {
+    // Print preview is responding to a resolution of "print" promise. Send the
+    // print message to the renderer.
+    RenderFrameHost* rfh = preview_web_contents()->GetMainFrame();
+    rfh->Send(
+        new PrintMsg_PrintForPrintPreview(rfh->GetRoutingID(), *settings_));
+    settings_ = nullptr;

[Lei Zhang, 2017/06/27 21:58:48]

Let's call settings_.reset() so it's more obvious that it's a smart pointer and
not a raw pointer.

[rbpotter, 2017/06/28 00:18:58]

Done.

+
+    // Clear the initiator so that it can open a new print preview dialog, while
+    // the current print preview dialog is still handling its print job.
     WebContents* initiator = GetInitiator();
     ClearInitiatorDetails();
 
     // Since the preview dialog will be hidden and not closed, we need to make
     // this call.
     if (initiator) {
       auto* print_view_manager = PrintViewManager::FromWebContents(initiator);
       print_view_manager->PrintPreviewDone();
     }
-
-    // Since the initiator is cleared, only want to do this once.
-    printing_started_ = false;
   }
 
   print_preview_ui()->OnHidePreviewDialog();
 }
 
 void PrintPreviewHandler::HandleCancelPendingPrintRequest(
     const base::ListValue* /*args*/) {
   WebContents* initiator = GetInitiator();
   if (initiator)
     ClearInitiatorDetails();
@@ skipping 782 matching lines @@
 
 void PrintPreviewHandler::UnregisterForGaiaCookieChanges() {
   if (gaia_cookie_manager_service_)
     gaia_cookie_manager_service_->RemoveObserver(this);
 }
 
 void PrintPreviewHandler::SetPdfSavedClosureForTesting(
     const base::Closure& closure) {
   pdf_file_saved_closure_ = closure;
 }