Gracefully handle extremely small windows in tab-modal sign in flow.

chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc

 // Copyright 2016 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/ui/views/profiles/signin_view_controller_delegate_views.h"
 
 #include "base/macros.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_avatar_icon_util.h"
 #include "chrome/browser/signin/signin_promo.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
+#include "chrome/browser/ui/views/frame/browser_view.h"
 #include "chrome/common/url_constants.h"
 #include "components/constrained_window/constrained_window_views.h"
 #include "components/signin/core/common/profile_management_switches.h"
+#include "components/web_modal/web_contents_modal_dialog_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/widget/widget.h"
 
 const int kPasswordCombinedFixedGaiaViewHeight = 440;
 const int kPasswordCombinedFixedGaiaViewWidth = 360;
 const int kFixedGaiaViewHeight = 612;
 const int kModalDialogWidth = 448;
 const int kSyncConfirmationDialogHeight = 487;
@@ skipping 43 matching lines @@
 
 int SigninViewControllerDelegateViews::GetDialogButtons() const {
   return ui::DIALOG_BUTTON_NONE;
 }
 
 void SigninViewControllerDelegateViews::PerformClose() {
   modal_signin_widget_->Close();
 }
 
 void SigninViewControllerDelegateViews::ResizeNativeView(int height) {
-  content_view_->SetPreferredSize(gfx::Size(kModalDialogWidth, height));
+  int max_height = browser_
+      ->window()
+      ->GetWebContentsModalDialogHost()
+      ->GetMaximumDialogSize().height();
+  content_view_->SetPreferredSize(
+      gfx::Size(kModalDialogWidth, std::min(height, max_height)));
   content_view_->Layout();
 
   if (wait_for_size_) {
     // The modal wasn't displayed yet so just show it with the already resized
     // view.
     DisplayModal();
   }
 }
 
 void SigninViewControllerDelegateViews::DisplayModal() {
   modal_signin_widget_ = constrained_window::ShowWebModalDialogViews(
       this, browser_->tab_strip_model()->GetActiveWebContents());
   content_view_->RequestFocus();
 }
 
 // static
 views::WebView* SigninViewControllerDelegateViews::CreateGaiaWebView(
     content::WebContentsDelegate* delegate,
     profiles::BubbleViewMode mode,
-    Profile* profile,
+    Browser* browser,
     signin_metrics::AccessPoint access_point) {
   GURL url =
-      signin::GetSigninURLFromBubbleViewMode(profile, mode, access_point);
+      signin::GetSigninURLFromBubbleViewMode(
+          browser->profile(), mode, access_point);
 
+  int max_height = browser
+      ->window()
+      ->GetWebContentsModalDialogHost()
+      ->GetMaximumDialogSize().height();
   // Adds Gaia signin webview.
   const gfx::Size pref_size =
       switches::UsePasswordSeparatedSigninFlow()
-          ? gfx::Size(kModalDialogWidth, kFixedGaiaViewHeight)
+          ? gfx::Size(kModalDialogWidth,
+                      std::min(kFixedGaiaViewHeight, max_height))
           : gfx::Size(kPasswordCombinedFixedGaiaViewWidth,
                       kPasswordCombinedFixedGaiaViewHeight);
-  views::WebView* web_view = new views::WebView(profile);
+  views::WebView* web_view = new views::WebView(browser->profile());
   web_view->LoadInitialURL(url);
 
   if (delegate)
     web_view->GetWebContents()->SetDelegate(delegate);
 
   web_view->SetPreferredSize(pref_size);
   content::RenderWidgetHostView* rwhv =
       web_view->GetWebContents()->GetRenderWidgetHostView();
   if (rwhv)
     rwhv->SetBackgroundColor(profiles::kAvatarBubbleGaiaBackgroundColor);
 
   return web_view;
 }
 
 views::WebView*
 SigninViewControllerDelegateViews::CreateSyncConfirmationWebView(
-    Profile* profile) {
-  views::WebView* web_view = new views::WebView(profile);
+    Browser* browser) {
+  views::WebView* web_view = new views::WebView(browser->profile());
   web_view->LoadInitialURL(GURL(chrome::kChromeUISyncConfirmationURL));
+
+  int max_height = browser
+      ->window()
+      ->GetWebContentsModalDialogHost()
+      ->GetMaximumDialogSize().height();
   web_view->SetPreferredSize(
-      gfx::Size(kModalDialogWidth, kSyncConfirmationDialogHeight));
+      gfx::Size(kModalDialogWidth,
+                std::min(kSyncConfirmationDialogHeight, max_height)));
 
   return web_view;
 }
 
 SigninViewControllerDelegate*
 SigninViewControllerDelegate::CreateModalSigninDelegate(
     SigninViewController* signin_view_controller,
     profiles::BubbleViewMode mode,
     Browser* browser,
     signin_metrics::AccessPoint access_point) {
   return new SigninViewControllerDelegateViews(
       signin_view_controller,
       SigninViewControllerDelegateViews::CreateGaiaWebView(
-          nullptr, mode, browser->profile(), access_point),
+          nullptr, mode, browser, access_point),
       browser, false);
 }
 
 SigninViewControllerDelegate*
 SigninViewControllerDelegate::CreateSyncConfirmationDelegate(
     SigninViewController* signin_view_controller,
     Browser* browser) {
   return new SigninViewControllerDelegateViews(
       signin_view_controller,
-      SigninViewControllerDelegateViews::CreateSyncConfirmationWebView(
-          browser->profile()),
+      SigninViewControllerDelegateViews::CreateSyncConfirmationWebView(browser),
       browser, true);
 }