Fix print preview size calculation.

chrome/browser/printing/print_preview_dialog_controller.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/printing/print_preview_dialog_controller.h"
 
 #include <algorithm>
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/path_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/plugins/chrome_plugin_service_filter.h"
 #include "chrome/browser/printing/print_view_manager.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_finder.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h"
 #include "chrome/browser/ui/webui/constrained_web_dialog_ui.h"
 #include "chrome/browser/ui/webui/print_preview/print_preview_ui.h"
 #include "chrome/common/chrome_content_client.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/url_constants.h"
+#include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "content/public/browser/navigation_controller.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/plugin_service.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_delegate.h"
@@ skipping 77 matching lines @@
 
 void PrintPreviewDialogDelegate::GetWebUIMessageHandlers(
     std::vector<WebUIMessageHandler*>* /* handlers */) const {
   // PrintPreviewUI adds its own message handlers.
 }
 
 void PrintPreviewDialogDelegate::GetDialogSize(gfx::Size* size) const {
   DCHECK(size);
   const gfx::Size kMinDialogSize(800, 480);
   const int kBorder = 25;
-  const int kConstrainedWindowOverlap = 3;
-  gfx::Rect rect;
-  initiator_->GetView()->GetContainerBounds(&rect);
-  size->set_width(std::max(rect.width(), kMinDialogSize.width()) - 2 * kBorder);
-  size->set_height(std::max(rect.height(), kMinDialogSize.height()) - kBorder +
-                   kConstrainedWindowOverlap);
+
+  Browser* browser = chrome::FindBrowserWithWebContents(initiator_);
+  if (!browser)
+    return;
+  *size = browser->window()->GetWebContentsModalDialogHost()->
+      GetMaximumDialogSize();

[Vitaly Buka (NO REVIEWS), 2013/09/06 21:14:29]

Shouldn't we put at least kMinDialogSize in case of browser is null?

[Rune Fevang, 2013/09/06 22:27:55]

That seems reasonable, good idea :)

+  size->SetToMax(kMinDialogSize);
+  size->Enlarge(-2 * kBorder, -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()));
+  size->SetToMin(kMaxDialogSize);
 #endif
 }
 
 std::string PrintPreviewDialogDelegate::GetDialogArgs() const {
   return std::string();
 }
 
 void PrintPreviewDialogDelegate::OnDialogClosed(
     const std::string& /* json_retval */) {
 }
@@ skipping 349 matching lines @@
   PrintPreviewUI* print_preview_ui =
       static_cast<PrintPreviewUI*>(preview_dialog->GetWebUI()->GetController());
   if (print_preview_ui)
     print_preview_ui->OnPrintPreviewDialogDestroyed();
 
   preview_dialog_map_.erase(preview_dialog);
   RemoveObservers(preview_dialog);
 }
 
 }  // namespace printing