summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrfevang@chromium.org <rfevang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-23 14:22:29 +0000
committerrfevang@chromium.org <rfevang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-23 14:22:29 +0000
commitbc5120584a3d576871a81d1da868ac320b1ce0b9 (patch)
treea67210da5cef6e45360745a439527ebb822e7cbb
parentdb340e5ac99e752f4f17364ed632aa37d11a5e83 (diff)
downloadchromium_src-bc5120584a3d576871a81d1da868ac320b1ce0b9.zip
chromium_src-bc5120584a3d576871a81d1da868ac320b1ce0b9.tar.gz
chromium_src-bc5120584a3d576871a81d1da868ac320b1ce0b9.tar.bz2
Fix GTK Print Preview size issue.
Gets the maximum size from the web view if there is no dialog host. BUG=310241 Review URL: https://codereview.chromium.org/35153010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@230416 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/printing/print_preview_dialog_controller.cc14
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/browser/printing/print_preview_dialog_controller.cc b/chrome/browser/printing/print_preview_dialog_controller.cc
index 799ae5b..ff8fd08 100644
--- a/chrome/browser/printing/print_preview_dialog_controller.cc
+++ b/chrome/browser/printing/print_preview_dialog_controller.cc
@@ -127,13 +127,15 @@ void PrintPreviewDialogDelegate::GetDialogSize(gfx::Size* size) const {
const int kBorder = 25;
*size = kMinDialogSize;
+ web_modal::WebContentsModalDialogHost* host = NULL;
Browser* browser = chrome::FindBrowserWithWebContents(initiator_);
- if (browser) {
- web_modal::WebContentsModalDialogHost* host =
- browser->window()->GetWebContentsModalDialogHost();
- if (host)
- size->SetToMax(host->GetMaximumDialogSize());
- }
+ if (browser)
+ host = browser->window()->GetWebContentsModalDialogHost();
+
+ if (host)
+ size->SetToMax(host->GetMaximumDialogSize());
+ else
+ size->SetToMax(initiator_->GetView()->GetContainerSize());
size->Enlarge(-2 * kBorder, -kBorder);
#if defined(OS_MACOSX)