summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-30 02:30:41 +0000
committercsilv@chromium.org <csilv@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-30 02:30:41 +0000
commit205ee5af8856b2200c5e5766c17fab38b3f3d43b (patch)
tree3de45f0c3da2c1f72015422a7eee5b6952b74305
parent4ae589487233c076abd03a0b1a962d4c2b8af935 (diff)
downloadchromium_src-205ee5af8856b2200c5e5766c17fab38b3f3d43b.zip
chromium_src-205ee5af8856b2200c5e5766c17fab38b3f3d43b.tar.gz
chromium_src-205ee5af8856b2200c5e5766c17fab38b3f3d43b.tar.bz2
[mac] Constrain the maximum size of the print preview sheet.
BUG=105815 TEST=Command-P on a very large window, sheet should be a max of 1000x660 pixels. Review URL: http://codereview.chromium.org/8744003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@112106 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/printing/print_preview_tab_controller.cc8
1 files changed, 8 insertions, 0 deletions
diff --git a/chrome/browser/printing/print_preview_tab_controller.cc b/chrome/browser/printing/print_preview_tab_controller.cc
index 9f542dd..8295e97 100644
--- a/chrome/browser/printing/print_preview_tab_controller.cc
+++ b/chrome/browser/printing/print_preview_tab_controller.cc
@@ -78,6 +78,14 @@ PrintPreviewTabDelegate::PrintPreviewTabDelegate(
initiator_tab->tab_contents()->GetContainerBounds(&rect);
size_.set_width(std::max(rect.width(), kMinDialogSize.width()) - kBorder);
size_.set_height(std::max(rect.height(), kMinDialogSize.height()) - kBorder);
+
+#if defined(OS_MACOSX)
+ // Limit the maximum size on MacOS X.
+ // http://crbug.com/105815
+ const gfx::Size kMaxDialogSize(1000, 660);
+ size_.set_width(std::min(size_.width(), kMaxDialogSize.width()));
+ size_.set_height(std::min(size_.height(), kMaxDialogSize.height()));
+#endif
}
PrintPreviewTabDelegate::~PrintPreviewTabDelegate() {