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"
@@ skipping 47 matching lines @@
   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) {
+                                              bool is_modifiable,
+                                              int preview_request_id) {
   DCHECK_GT(page_count, 0);
   document_cookie_ = document_cookie;
   FundamentalValue count(page_count);
   FundamentalValue modifiable(is_modifiable);
-  CallJavascriptFunction("onDidGetPreviewPageCount", count, modifiable);
+  FundamentalValue request_id(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);
   FundamentalValue number(page_number);
   StringValue ui_identifier(preview_ui_addr_str_);
-  CallJavascriptFunction("onDidPreviewPage", number, ui_identifier);
+  FundamentalValue request_id(preview_request_id);
+  CallJavascriptFunction("onDidPreviewPage", number, ui_identifier, request_id);
 }
 
 void PrintPreviewUI::OnReusePreviewData(int preview_request_id) {
   DecrementRequestCount();
 
   StringValue ui_identifier(preview_ui_addr_str_);
   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_;
 }