Print Preview: Fixing behavior of event listeners.

chrome/browser/printing/print_preview_message_handler.cc

Index: chrome/browser/printing/print_preview_message_handler.cc
diff --git a/chrome/browser/printing/print_preview_message_handler.cc b/chrome/browser/printing/print_preview_message_handler.cc
index d2b11813c98f09fd4b2e2da1fa898c80b2dc39ad..8e0278a13802b203e16b89fd586566730f9a2b3a 100644
--- a/chrome/browser/printing/print_preview_message_handler.cc
+++ b/chrome/browser/printing/print_preview_message_handler.cc
@@ -80,10 +80,9 @@ void PrintPreviewMessageHandler::OnRequestPrintPreview() {
   PrintPreviewTabController::PrintPreview(tab_contents());
 }
 
-void PrintPreviewMessageHandler::OnDidGetPreviewPageCount(int document_cookie,
-                                                          int page_count,
-                                                          bool is_modifiable) {
-  if (page_count <= 0)
+void PrintPreviewMessageHandler::OnDidGetPreviewPageCount(
+    const PrintHostMsg_DidGetPreviewPageCount_Params& params) {
+  if (params.page_count <= 0)
     return;
   TabContents* print_preview_tab = GetPrintPreviewTab();
   if (!print_preview_tab)
@@ -92,7 +91,8 @@ void PrintPreviewMessageHandler::OnDidGetPreviewPageCount(int document_cookie,
   PrintPreviewUI* print_preview_ui =
       static_cast<PrintPreviewUI*>(print_preview_tab->web_ui());
   print_preview_ui->OnDidGetPreviewPageCount(
-      document_cookie, page_count, is_modifiable);
+      params.document_cookie, params.page_count, params.is_modifiable,
+      params.preview_request_id);
 }
 
 void PrintPreviewMessageHandler::OnDidPreviewPage(
@@ -128,7 +128,7 @@ void PrintPreviewMessageHandler::OnDidPreviewPage(
     DCHECK(data_bytes);
 
     print_preview_ui->SetPrintPreviewDataForIndex(page_number, data_bytes);
-    print_preview_ui->OnDidPreviewPage(page_number);
+    print_preview_ui->OnDidPreviewPage(page_number, params.preview_request_id);
     // TODO(kmadhusu): Query |PrintPreviewUI| and update
     // |requested_preview_page_index| accordingly.
   }
@@ -155,9 +155,9 @@ void PrintPreviewMessageHandler::OnPagesReadyForPreview(
 
   if (params.reuse_existing_data) {
     // Need to match normal rendering where we are expected to send this.
-    print_preview_ui->OnDidGetPreviewPageCount(params.document_cookie,
-                                               params.expected_pages_count,
-                                               params.modifiable);
+    print_preview_ui->OnDidGetPreviewPageCount(
+        params.document_cookie, params.expected_pages_count, params.modifiable,
+        params.preview_request_id);
 
     print_preview_ui->OnReusePreviewData(params.preview_request_id);
     return;