Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(595)

Unified Diff: chrome/browser/printing/print_preview_message_handler.cc

Issue 7550022: Print Preview: Fixing behavior of event listeners. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressing comments Created 9 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 11be0547ab30902031f10d75b3c71fe5494e8ec4..6cc707aa1e45db094066ddfdcf521f67ddb2c5e9 100644
--- a/chrome/browser/printing/print_preview_message_handler.cc
+++ b/chrome/browser/printing/print_preview_message_handler.cc
@@ -82,10 +82,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();
@@ -94,8 +93,7 @@ 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);
+ print_preview_ui->OnDidGetPreviewPageCount(params);
}
void PrintPreviewMessageHandler::OnDidPreviewPage(
@@ -131,7 +129,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.
}
@@ -158,10 +156,12 @@ 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);
-
+ PrintHostMsg_DidGetPreviewPageCount_Params temp_params;
+ temp_params.page_count = params.expected_pages_count;
+ temp_params.document_cookie = params.document_cookie;
+ temp_params.is_modifiable = params.modifiable;
+ temp_params.preview_request_id = params.preview_request_id;
+ print_preview_ui->OnDidGetPreviewPageCount(temp_params);
print_preview_ui->OnReusePreviewData(params.preview_request_id);
return;
}
« no previous file with comments | « chrome/browser/printing/print_preview_message_handler.h ('k') | chrome/browser/resources/print_preview/color_settings.js » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698