Print Preview: Fixing behavior of event listeners.

chrome/browser/ui/webui/print_preview_ui.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/ui/webui/print_preview_ui.h"
 
 #include "base/metrics/histogram.h"
 #include "base/string_util.h"
 #include "base/values.h"
 #include "chrome/browser/printing/print_preview_data_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/webui/print_preview_data_source.h"
 #include "chrome/browser/ui/webui/print_preview_handler.h"
+#include "chrome/common/print_messages.h"
 #include "content/browser/tab_contents/tab_contents.h"
 
 PrintPreviewUI::PrintPreviewUI(TabContents* contents)
     : ChromeWebUI(contents),
       initial_preview_start_time_(base::TimeTicks::Now()),
       request_count_(0U),
       document_cookie_(0) {
   // WebUI owns |handler_|.
   handler_ = new PrintPreviewHandler();
   AddMessageHandler(handler_->Attach(this));
@@ skipping 32 matching lines @@
 void PrintPreviewUI::OnInitiatorTabClosed(
     const std::string& initiator_url) {
   StringValue initiator_tab_url(initiator_url);
   CallJavascriptFunction("onInitiatorTabClosed", initiator_tab_url);
 }
 
 void PrintPreviewUI::OnPrintPreviewRequest() {
   request_count_++;
 }
 
-void PrintPreviewUI::OnDidGetPreviewPageCount(int document_cookie,
-                                              int page_count,
-                                              bool is_modifiable) {
-  DCHECK_GT(page_count, 0);
-  document_cookie_ = document_cookie;
-  base::FundamentalValue count(page_count);
-  base::FundamentalValue modifiable(is_modifiable);
-  CallJavascriptFunction("onDidGetPreviewPageCount", count, modifiable);
+void PrintPreviewUI::OnDidGetPreviewPageCount(
+    const PrintHostMsg_DidGetPreviewPageCount_Params& params) {
+  DCHECK_GT(params.page_count, 0);
+  document_cookie_ = params.document_cookie;
+  base::FundamentalValue count(params.page_count);
+  base::FundamentalValue modifiable(params.is_modifiable);
+  base::FundamentalValue request_id(params.preview_request_id);
+  CallJavascriptFunction("onDidGetPreviewPageCount", count, modifiable,
+                         request_id);
 }
 
-void PrintPreviewUI::OnDidPreviewPage(int page_number) {
+void PrintPreviewUI::OnDidPreviewPage(int page_number,
+                                      int preview_request_id) {
   DCHECK_GE(page_number, 0);
   base::FundamentalValue number(page_number);
-  base::StringValue ui_identifier(preview_ui_addr_str_);
-  CallJavascriptFunction("onDidPreviewPage", number, ui_identifier);
+  StringValue ui_identifier(preview_ui_addr_str_);
+  base::FundamentalValue request_id(preview_request_id);
+  CallJavascriptFunction("onDidPreviewPage", number, ui_identifier, request_id);
 }
 
 void PrintPreviewUI::OnReusePreviewData(int preview_request_id) {
   DecrementRequestCount();
 
   base::StringValue ui_identifier(preview_ui_addr_str_);
   base::FundamentalValue ui_preview_request_id(preview_request_id);
   CallJavascriptFunction("reloadPreviewPages", ui_identifier,
                          ui_preview_request_id);
 }
@@ skipping 45 matching lines @@
 }
 
 void PrintPreviewUI::DecrementRequestCount() {
   if (request_count_ > 0)
     request_count_--;
 }
 
 int PrintPreviewUI::document_cookie() {
   return document_cookie_;
 }