diff options
| author | dpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 20:16:25 +0000 |
|---|---|---|
| committer | dpapad@chromium.org <dpapad@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-13 20:16:25 +0000 |
| commit | a88513546c84ee492c25cb502b0331dc9c5479a6 (patch) | |
| tree | a697fc46c6255a8935f22fb52b8a133588a1ae13 /chrome/browser/ui | |
| parent | 623c832ec466551be83f9971943bdcc94c9fd382 (diff) | |
| download | chromium_src-a88513546c84ee492c25cb502b0331dc9c5479a6.zip chromium_src-a88513546c84ee492c25cb502b0331dc9c5479a6.tar.gz chromium_src-a88513546c84ee492c25cb502b0331dc9c5479a6.tar.bz2 | |
Print Preview: Associating preview requests and responses using an identifier
BUG=88807, 89106
TEST=NONE
Review URL: http://codereview.chromium.org/7313035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92402 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui')
| -rw-r--r-- | chrome/browser/ui/webui/print_preview_ui.cc | 6 | ||||
| -rw-r--r-- | chrome/browser/ui/webui/print_preview_ui.h | 4 |
2 files changed, 7 insertions, 3 deletions
diff --git a/chrome/browser/ui/webui/print_preview_ui.cc b/chrome/browser/ui/webui/print_preview_ui.cc index e5efdfa..f6de73c 100644 --- a/chrome/browser/ui/webui/print_preview_ui.cc +++ b/chrome/browser/ui/webui/print_preview_ui.cc @@ -68,7 +68,8 @@ void PrintPreviewUI::OnDidPreviewPage(int page_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(); @@ -84,8 +85,9 @@ void PrintPreviewUI::OnPreviewDataIsAvailable(int 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() { diff --git a/chrome/browser/ui/webui/print_preview_ui.h b/chrome/browser/ui/webui/print_preview_ui.h index f2d44ce..28a91ad 100644 --- a/chrome/browser/ui/webui/print_preview_ui.h +++ b/chrome/browser/ui/webui/print_preview_ui.h @@ -46,9 +46,11 @@ class PrintPreviewUI : public ChromeWebUI { // |job_title| is the title of the page being previewed. // |modifiable| indicates if the preview can be rerendered with different // print settings. + // |preview_request_id| indicates wich request resulted in this response. void OnPreviewDataIsAvailable(int expected_pages_count, const string16& job_title, - bool modifiable); + bool modifiable, + int preview_request_id); // Notify the Web UI that a navigation has occurred in this tab. This is the // last chance to communicate with the source tab before the assocation is |