summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui/print_preview_handler.cc
diff options
context:
space:
mode:
authorthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 08:55:24 +0000
committerthestig@chromium.org <thestig@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-23 08:55:24 +0000
commita9c36832d49e1fe97cfb378b474e047955917c40 (patch)
treef9b67f10f9c5341a43d3fdea471774b4e54eb166 /chrome/browser/ui/webui/print_preview_handler.cc
parentb0dafaf9f930b128ef43d752c15a1bdb7620062b (diff)
downloadchromium_src-a9c36832d49e1fe97cfb378b474e047955917c40.zip
chromium_src-a9c36832d49e1fe97cfb378b474e047955917c40.tar.gz
chromium_src-a9c36832d49e1fe97cfb378b474e047955917c40.tar.bz2
Print Preview: Properly handle window.print().
BUG=92107 TEST=see bug Review URL: http://codereview.chromium.org/8515017 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111332 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/print_preview_handler.cc')
-rw-r--r--chrome/browser/ui/webui/print_preview_handler.cc9
1 files changed, 5 insertions, 4 deletions
diff --git a/chrome/browser/ui/webui/print_preview_handler.cc b/chrome/browser/ui/webui/print_preview_handler.cc
index 0f04e4a..e4d6342 100644
--- a/chrome/browser/ui/webui/print_preview_handler.cc
+++ b/chrome/browser/ui/webui/print_preview_handler.cc
@@ -368,10 +368,10 @@ void PrintPreviewHandler::HandlePrint(const ListValue* args) {
regenerate_preview_request_count_);
TabContentsWrapper* initiator_tab = GetInitiatorTab();
- if (initiator_tab) {
- RenderViewHost* rvh = initiator_tab->render_view_host();
- rvh->Send(new PrintMsg_ResetScriptedPrintCount(rvh->routing_id()));
- }
+ CHECK(initiator_tab);
+
+ RenderViewHost* init_rvh = initiator_tab->render_view_host();
+ init_rvh->Send(new PrintMsg_ResetScriptedPrintCount(init_rvh->routing_id()));
scoped_ptr<DictionaryValue> settings(GetSettingsDictionary(args));
if (!settings.get())
@@ -439,6 +439,7 @@ void PrintPreviewHandler::HandlePrint(const ListValue* args) {
RenderViewHost* rvh = web_ui_->tab_contents()->render_view_host();
rvh->Send(new PrintMsg_PrintForPrintPreview(rvh->routing_id(), *settings));
}
+ initiator_tab->print_view_manager()->PrintPreviewDone();
}
void PrintPreviewHandler::HandlePrintToPdf(