Print Preview: Associating preview requests and responses using an identifier

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 50 matching lines @@
 }
 
 void PrintPreviewUI::OnDidPreviewPage(int page_number) {
   DCHECK_GE(page_number, 0);
   FundamentalValue number(page_number);
   CallJavascriptFunction("onDidPreviewPage", number);
 }
 
 void PrintPreviewUI::OnPreviewDataIsAvailable(int expected_pages_count,
                                               const string16& job_title,
-                                              bool modifiable) {
+                                              bool modifiable,
+                                              int preview_request_id) {
   VLOG(1) << "Print preview request finished with "
           << expected_pages_count << " pages";
   DecrementRequestCount();
 
   if (!initial_preview_start_time_.is_null()) {
     UMA_HISTOGRAM_TIMES("PrintPreview.InitalDisplayTime",
                         base::TimeTicks::Now() - initial_preview_start_time_);
     UMA_HISTOGRAM_COUNTS("PrintPreview.PageCount.Initial",
                          expected_pages_count);
     initial_preview_start_time_ = base::TimeTicks();
   }
   FundamentalValue pages_count(expected_pages_count);
   StringValue title(job_title);
   FundamentalValue is_preview_modifiable(modifiable);
   StringValue ui_identifier(preview_ui_addr_str_);
+  FundamentalValue ui_preview_request_id(preview_request_id);
   CallJavascriptFunction("updatePrintPreview", title, is_preview_modifiable,
-                         ui_identifier);
+                         ui_identifier, ui_preview_request_id);
 }
 
 void PrintPreviewUI::OnNavigation() {
   handler_->OnNavigation();
 }
 
 void PrintPreviewUI::OnFileSelectionCancelled() {
   CallJavascriptFunction("fileSelectionCancelled");
 }
 
@@ skipping 12 matching lines @@
 
 PrintPreviewDataService* PrintPreviewUI::print_preview_data_service() {
   return PrintPreviewDataService::GetInstance();
 }
 
 void PrintPreviewUI::DecrementRequestCount() {
   DCHECK_GT(request_count_, 0U);
   if (request_count_ > 0)
     request_count_--;
 }