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

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: Change to CrOS only. 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..7872ebb7072a15b077cda076d9f877f2a7906c20 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,7 +97,8 @@ void PrintPreviewDialogDelegate::GetWebUIMessageHandlers(
void PrintPreviewDialogDelegate::GetDialogSize(gfx::Size* size) const {
DCHECK(size);
- const gfx::Size kMinDialogSize(800, 480);
+ // Modified to match requested size. Previously: 800, 480.
Mike Wittman 2016/08/12 22:51:34 This comment likely can be removed. Anyone who wan
rbpotter 2016/08/15 18:03:45 Done.
+ const gfx::Size kMinDialogSize(438, 455);
Mike Wittman 2016/08/12 22:51:34 Should this be sized differently depending on whet
rbpotter 2016/08/15 18:03:45 If there's not independent bounds key, the dialog
const int kBorder = 25;
*size = kMinDialogSize;
@@ -114,7 +113,11 @@ void PrintPreviewDialogDelegate::GetDialogSize(gfx::Size* size) const {
size->SetToMax(host->GetMaximumDialogSize());
else
size->SetToMax(outermost_web_contents->GetContainerBounds().size());
- size->Enlarge(-2 * kBorder, -kBorder);
+ int expand_width =
Mike Wittman 2016/08/12 22:51:34 Same question here.
rbpotter 2016/08/15 18:03:45 See above
+ std::min(size->width() - kMinDialogSize.width(), 2 * kBorder);
+ int expand_height =
+ std::min(size->height() - kMinDialogSize.height(), kBorder);
+ size->Enlarge(-expand_width, -expand_height);
#if defined(OS_MACOSX)
// Limit the maximum size on MacOS X.
@@ -364,10 +367,16 @@ WebContents* PrintPreviewDialogController::CreatePrintPreviewDialog(
base::AutoReset<bool> auto_reset(&is_creating_print_preview_dialog_, true);
// The dialog delegates are deleted when the dialog is closed.
+#if defined(OS_MACOSX)
Mike Wittman 2016/08/12 22:51:34 Can we drop the #if part here and just have ShowTo
rbpotter 2016/08/15 18:03:45 Done.
+ ConstrainedWebDialogDelegate* web_dialog_delegate = ShowConstrainedWebDialog(
+ initiator->GetBrowserContext(), new PrintPreviewDialogDelegate(initiator),
+ initiator);
+#else
ConstrainedWebDialogDelegate* web_dialog_delegate =
- ShowConstrainedWebDialog(initiator->GetBrowserContext(),
- new PrintPreviewDialogDelegate(initiator),
- initiator);
+ ShowTopLevelConstrainedWebDialog(
+ initiator->GetBrowserContext(),
+ new PrintPreviewDialogDelegate(initiator), initiator);
+#endif
WebContents* preview_dialog = web_dialog_delegate->GetWebContents();

Powered by Google App Engine
This is Rietveld 408576698