diff options
| author | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 23:37:55 +0000 |
|---|---|---|
| committer | mark@chromium.org <mark@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-01-28 23:37:55 +0000 |
| commit | 87c0254db050a6df147be484e2496aaa4b4f95a1 (patch) | |
| tree | f0db8c3d0ab2c5e92ae48e43cbf210ca1e3042dd /chrome/browser/tab_contents/web_contents.cc | |
| parent | 0fc9dca2aae7f778a5a43aee1f898af7d93b15b8 (diff) | |
| download | chromium_src-87c0254db050a6df147be484e2496aaa4b4f95a1.zip chromium_src-87c0254db050a6df147be484e2496aaa4b4f95a1.tar.gz chromium_src-87c0254db050a6df147be484e2496aaa4b4f95a1.tar.bz2 | |
Roll back r8821
Review URL: http://codereview.chromium.org/19453
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@8834 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/tab_contents/web_contents.cc')
| -rw-r--r-- | chrome/browser/tab_contents/web_contents.cc | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/chrome/browser/tab_contents/web_contents.cc b/chrome/browser/tab_contents/web_contents.cc index 63e6689..5c2fdb2 100644 --- a/chrome/browser/tab_contents/web_contents.cc +++ b/chrome/browser/tab_contents/web_contents.cc @@ -589,8 +589,15 @@ void WebContents::SavePage(const std::wstring& main_file, } void WebContents::PrintPreview() { - // We don't show the print preview yet, only the print dialog. - PrintNow(); + // We can't print interstitial page for now. + if (showing_interstitial_page()) + return; + + // If we have a find bar it needs to hide as well. + view_->HideFindBar(false); + + // We don't show the print preview for the beta, only the print dialog. + printing_.ShowPrintDialog(); } bool WebContents::PrintNow() { @@ -601,7 +608,7 @@ bool WebContents::PrintNow() { // If we have a find bar it needs to hide as well. view_->HideFindBar(false); - return render_view_host()->PrintPages(); + return printing_.PrintNow(); } bool WebContents::IsActiveEntry(int32 page_id) { |