Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2998)

Unified Diff: chrome/browser/printing/print_preview_dialog_controller.cc

Issue 2172363002: Created min size for print preview dialog and modified to allow the Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix ifdef logic, return deps to normal Created 4 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/printing/print_preview_dialog_controller.cc
diff --git a/chrome/browser/printing/print_preview_dialog_controller.cc b/chrome/browser/printing/print_preview_dialog_controller.cc
index 6211d5c39e99661f74f0542e1160510e06b3018d..19b82a39479d5150793193574509b2bebff38db5 100644
--- a/chrome/browser/printing/print_preview_dialog_controller.cc
+++ b/chrome/browser/printing/print_preview_dialog_controller.cc
@@ -78,9 +78,7 @@ PrintPreviewDialogDelegate::~PrintPreviewDialogDelegate() {
}
ui::ModalType PrintPreviewDialogDelegate::GetDialogModalType() const {
- // Not used, returning dummy value.
- NOTREACHED();
- return ui::MODAL_TYPE_WINDOW;
+ return ui::MODAL_TYPE_CHILD;
}
base::string16 PrintPreviewDialogDelegate::GetDialogTitle() const {
@@ -99,10 +97,16 @@ void PrintPreviewDialogDelegate::GetWebUIMessageHandlers(
void PrintPreviewDialogDelegate::GetDialogSize(gfx::Size* size) const {
DCHECK(size);
- const gfx::Size kMinDialogSize(800, 480);
const int kBorder = 25;
+// Gives ChromeOS dialogs the requested minimum size of 438x455 without changing
+// the existing behavior on Mac OSX. For all other platforms, the min size
+// is later overriden by the size of the parent window.
+#if defined(OS_MACOSX)
+ const gfx::Size kMinDialogSize(800, 480);
+#else
+ const gfx::Size kMinDialogSize(438, 455);
+#endif
*size = kMinDialogSize;
-
web_modal::WebContentsModalDialogHost* host = nullptr;
content::WebContents* outermost_web_contents =
guest_view::GuestViewBase::GetTopLevelWebContents(initiator_);
@@ -114,8 +118,15 @@ void PrintPreviewDialogDelegate::GetDialogSize(gfx::Size* size) const {
size->SetToMax(host->GetMaximumDialogSize());
else
size->SetToMax(outermost_web_contents->GetContainerBounds().size());
- size->Enlarge(-2 * kBorder, -kBorder);
-
+#if defined(OS_MACOSX)
+ size->Enlarge(-2*kBorder, -kBorder);
+#else
+ int expand_width =
+ std::min(size->width() - kMinDialogSize.width(), 2 * kBorder);
+ int expand_height =
+ std::min(size->height() - kMinDialogSize.height(), kBorder);
+ size->Enlarge(-expand_width, -expand_height);
+#endif
#if defined(OS_MACOSX)
// Limit the maximum size on MacOS X.
// http://crbug.com/105815
@@ -365,10 +376,9 @@ WebContents* PrintPreviewDialogController::CreatePrintPreviewDialog(
// The dialog delegates are deleted when the dialog is closed.
ConstrainedWebDialogDelegate* web_dialog_delegate =
- ShowConstrainedWebDialog(initiator->GetBrowserContext(),
- new PrintPreviewDialogDelegate(initiator),
- initiator);
-
+ ShowNonClippedConstrainedWebDialog(
+ initiator->GetBrowserContext(),
+ new PrintPreviewDialogDelegate(initiator), initiator);
WebContents* preview_dialog = web_dialog_delegate->GetWebContents();
// Clear the zoom level for the print preview dialog so it isn't affected by

Powered by Google App Engine
This is Rietveld 408576698