Print Preview: Associating preview requests and responses using an identifier

chrome/renderer/print_web_view_helper.cc

Index: chrome/renderer/print_web_view_helper.cc
diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc
index 1b2a509adabf5f29bf21ebda517216fefdc39316..413a0639dda5a42ce8bc99c31019e8553b0937a0 100644
--- a/chrome/renderer/print_web_view_helper.cc
+++ b/chrome/renderer/print_web_view_helper.cc
@@ -378,6 +378,7 @@ void PrintWebViewHelper::PrintPreview(WebKit::WebFrame* frame,
         print_pages_params_->params.document_cookie;
     preview_params.expected_pages_count = preview_page_count_;
     preview_params.modifiable = IsModifiable(frame, node);
+    settings.GetInteger("requestID", &preview_params.preview_request_id);

[Lei Zhang, 2011/07/12 22:36:31]

can you put requestID in printing/print_job_constants.h?

[dpapad, 2011/07/12 23:02:11]

Done.

 
     Send(new PrintHostMsg_PagesReadyForPreview(routing_id(), preview_params));
     return;
@@ -654,6 +655,11 @@ bool PrintWebViewHelper::UpdatePrintSettings(
   if (!settings.params.dpi || !settings.params.document_cookie)
     return false;
 
+  if (!job_settings.GetInteger(

[Lei Zhang, 2011/07/12 22:36:31]

You can do this check first before the Send() to fail early without having to
send an IPC to the browser.

I'd also add a NOTREACHED() since this should never fail.

[dpapad, 2011/07/12 23:02:11]

Done.

+      "requestID", &settings.params.preview_request_id)) {
+    return false;
+  }
+
   print_pages_params_.reset(new PrintMsg_PrintPages_Params(settings));
   Send(new PrintHostMsg_DidGetDocumentCookie(routing_id(),
                                              settings.params.document_cookie));