Print Preview: Associating preview requests and responses using an identifier

BUG=88807, 89106
TEST=NONE


Review URL: http://codereview.chromium.org/7313035

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92402 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 12 insertions, 0 deletions

diff --git a/chrome/renderer/print_web_view_helper.cc b/chrome/renderer/print_web_view_helper.cc
index a1c3382..8302907 100644
--- a/chrome/renderer/print_web_view_helper.cc
+++ b/chrome/renderer/print_web_view_helper.cc
@@ -382,6 +382,8 @@ 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);
+    preview_params.preview_request_id =
+        print_pages_params_->params.preview_request_id;
 
     Send(new PrintHostMsg_PagesReadyForPreview(routing_id(), preview_params));
     return;
@@ -686,6 +688,12 @@ bool PrintWebViewHelper::UpdatePrintSettingsLocal(
   if (settings.params.dpi < kMinDpi || !settings.params.document_cookie)
     return false;
 
+  if (!job_settings.GetInteger(printing::kPreviewRequestID,
+                               &settings.params.preview_request_id)) {
+    NOTREACHED();
+    return false;
+  }
+
   print_pages_params_.reset(new PrintMsg_PrintPages_Params(settings));
   Send(new PrintHostMsg_DidGetDocumentCookie(routing_id(),
                                              settings.params.document_cookie));
diff --git a/chrome/renderer/print_web_view_helper_browsertest.cc b/chrome/renderer/print_web_view_helper_browsertest.cc
index 1dd8e51..97873d6 100644
--- a/chrome/renderer/print_web_view_helper_browsertest.cc
+++ b/chrome/renderer/print_web_view_helper_browsertest.cc
@@ -41,6 +41,7 @@ void CreatePrintSettingsDictionary(DictionaryValue* dict) {
   dict->SetInteger(printing::kSettingDuplexMode, printing::SIMPLEX);
   dict->SetInteger(printing::kSettingCopies, 1);
   dict->SetString(printing::kSettingDeviceName, "dummy");
+  dict->SetInteger(printing::kPreviewRequestID, 12345);
 }
 
 }  // namespace
diff --git a/chrome/renderer/print_web_view_helper_linux.cc b/chrome/renderer/print_web_view_helper_linux.cc
index 9255a00..4947f14 100644
--- a/chrome/renderer/print_web_view_helper_linux.cc
+++ b/chrome/renderer/print_web_view_helper_linux.cc
@@ -49,6 +49,7 @@ bool PrintWebViewHelper::CreatePreviewDocument(
   preview_params.document_cookie = params.params.document_cookie;
   preview_params.expected_pages_count = preview_page_count_;
   preview_params.modifiable = IsModifiable(frame, node);
+  preview_params.preview_request_id = params.params.preview_request_id;
 
   if (!CopyMetafileDataToSharedMem(&metafile,
                                    &(preview_params.metafile_data_handle))) {
diff --git a/chrome/renderer/print_web_view_helper_mac.mm b/chrome/renderer/print_web_view_helper_mac.mm
index 54521ff..5878c20 100644
--- a/chrome/renderer/print_web_view_helper_mac.mm
+++ b/chrome/renderer/print_web_view_helper_mac.mm
@@ -127,6 +127,7 @@ bool PrintWebViewHelper::CreatePreviewDocument(
   preview_params.document_cookie = params.params.document_cookie;
   preview_params.expected_pages_count = preview_page_count_;
   preview_params.modifiable = IsModifiable(frame, node);
+  preview_params.preview_request_id = params.params.preview_request_id;
 
   // Ask the browser to create the shared memory for us.
   if (!CopyMetafileDataToSharedMem(&metafile,
diff --git a/chrome/renderer/print_web_view_helper_win.cc b/chrome/renderer/print_web_view_helper_win.cc
index 9528797..36139be 100644
--- a/chrome/renderer/print_web_view_helper_win.cc
+++ b/chrome/renderer/print_web_view_helper_win.cc
@@ -199,6 +199,7 @@ bool PrintWebViewHelper::CreatePreviewDocument(
   preview_params.document_cookie = params.params.document_cookie;
   preview_params.expected_pages_count = preview_page_count_;
   preview_params.modifiable = IsModifiable(frame, node);
+  preview_params.preview_request_id = params.params.preview_request_id;
 
   if (!CopyMetafileDataToSharedMem(metafile.get(),
                                    &(preview_params.metafile_data_handle))) {