Print Preview: Fixing behavior of event listeners.

chrome/browser/printing/print_preview_message_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/printing/print_preview_message_handler.h"
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/ref_counted_memory.h"
@@ skipping 62 matching lines @@
       printing::PrintPreviewTabController::GetInstance();
   if (!tab_controller)
     return NULL;
   return tab_controller->GetPrintPreviewForTab(tab_contents());
 }
 
 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)
     return;
 
   PrintPreviewUI* print_preview_ui =
       static_cast<PrintPreviewUI*>(print_preview_tab->web_ui());
   print_preview_ui->OnDidGetPreviewPageCount(

[kmadhusu, 2011/08/08 22:20:45]

You can change PrintPreviewUI::OnDidGetPreviewPageCount() to take 
PrintHostMsg_DidGetPreviewPageCount_Params as an argument. 

[dpapad, 2011/08/08 23:41:43]

I could, but I did not do it for consistency. None of the other methods in
PrintPreviewUI use the structs that are being used for IPC messages.

[kmadhusu, 2011/08/09 22:30:40]

No other method in PrintPreviewUI uses all of the struct member variables as
parameters. I think you can make this change now. 

[dpapad, 2011/08/10 00:17:10]

Done.

-      document_cookie, page_count, is_modifiable);
+      params.document_cookie, params.page_count, params.is_modifiable,
+      params.preview_request_id);
 }
 
 void PrintPreviewMessageHandler::OnDidPreviewPage(
     const PrintHostMsg_DidPreviewPage_Params& params) {
   RenderViewHost* rvh = tab_contents()->render_view_host();
   TabContents* print_preview_tab = GetPrintPreviewTab();
   if (!(print_preview_tab && print_preview_tab->web_ui())) {
     // Can't find print preview tab means we should abort.
     rvh->Send(new PrintMsg_AbortPreview(rvh->routing_id()));
     return;
@@ skipping 15 matching lines @@
 
   if (page_number == FIRST_PAGE_INDEX)
     print_preview_ui->ClearAllPreviewData();
 
   if (page_number >= FIRST_PAGE_INDEX && params.data_size) {
     RefCountedBytes* data_bytes =
         GetDataFromHandle(params.metafile_data_handle, params.data_size);
     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.
   }
 
   rvh->Send(new PrintMsg_ContinuePreview(rvh->routing_id(),
                                          requested_preview_page_index));
 }
 
 void PrintPreviewMessageHandler::OnPagesReadyForPreview(
     const PrintHostMsg_DidPreviewDocument_Params& params) {
   StopWorker(params.document_cookie);
 
   // Get the print preview tab.
   TabContents* print_preview_tab = GetPrintPreviewTab();
   // User might have closed it already.
   if (!print_preview_tab)
     return;
 
   PrintPreviewUI* print_preview_ui =
       static_cast<PrintPreviewUI*>(print_preview_tab->web_ui());
 
   TabContentsWrapper* wrapper =
       TabContentsWrapper::GetCurrentWrapperForContents(print_preview_tab);
 
   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);
+                                               params.modifiable,

[kmadhusu, 2011/08/08 22:20:45]

nit: Can you make this line style similar to line #94?

[dpapad, 2011/08/08 23:41:43]

Done.

+                                               params.preview_request_id);
 
     print_preview_ui->OnReusePreviewData(params.preview_request_id);
     return;
   }
 
   wrapper->print_view_manager()->OverrideTitle(tab_contents());
 
   // TODO(joth): This seems like a good match for using RefCountedStaticMemory
   // to avoid the memory copy, but the SetPrintPreviewData call chain below
   // needs updating to accept the RefCountedMemory* base class.
@@ skipping 54 matching lines @@
 }
 
 void PrintPreviewMessageHandler::DidStartLoading() {
   if (tab_contents()->delegate() &&
       printing::PrintPreviewTabController::IsPrintPreviewTab(tab_contents())) {
     tab_contents()->SetContentRestrictions(CONTENT_RESTRICTION_PRINT);
   }
 }
 
 }  // namespace printing