Fix sizing issues in the tab modal signin flow.

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

Index: chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
diff --git a/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc b/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
index defc7b14ced891038a8302fbd8c366401fb8da15..48c0e83ac9cbf776bb3c582c7aac4a9a7cc9ca33 100644
--- a/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
+++ b/chrome/browser/ui/views/profiles/signin_view_controller_delegate_views.cc
@@ -20,22 +20,23 @@
 
 const int kPasswordCombinedFixedGaiaViewHeight = 440;
 const int kPasswordCombinedFixedGaiaViewWidth = 360;
-const int kFixedGaiaViewHeight = 512;
-const int kFixedGaiaViewWidth = 448;
-const int kSyncConfirmationDialogWidth = 448;
+const int kFixedGaiaViewHeight = 612;
+const int kModalDialogWidth = 448;
 const int kSyncConfirmationDialogHeight = 351;
 
 SigninViewControllerDelegateViews::SigninViewControllerDelegateViews(
     SigninViewController* signin_view_controller,
     views::WebView* content_view,
-    Browser* browser)
+    Browser* browser,
+    bool wait_for_size)
     : SigninViewControllerDelegate(signin_view_controller,
                                    content_view->GetWebContents()),
       content_view_(content_view),
-      modal_signin_widget_(nullptr) {
-  modal_signin_widget_ = constrained_window::ShowWebModalDialogViews(
-      this, browser->tab_strip_model()->GetActiveWebContents());
-  content_view_->RequestFocus();
+      modal_signin_widget_(nullptr),
+      wait_for_size_(wait_for_size),
+      browser_(browser) {
+  if (!wait_for_size_)
+    DisplayModal();
 }
 
 SigninViewControllerDelegateViews::~SigninViewControllerDelegateViews() {}
@@ -74,6 +75,23 @@ void SigninViewControllerDelegateViews::PerformClose() {
   modal_signin_widget_->Close();
 }
 
+void SigninViewControllerDelegateViews::ResizeNativeView(int height) {
+  content_view_->SetPreferredSize(gfx::Size(kModalDialogWidth, height));
+  content_view_->Layout();
+
+  if (wait_for_size_) {
+    // The modal wasn't displayed yet so just show it with the already resized
+    // view.
+    DisplayModal();

[sky, 2016/04/04 15:04:02]

How do you know browser_ is valid by the time you got here? Active web contents
may differ from what was active at the time the
SigninViewControllerDelegateViews was created. Do you care?

[anthonyvd, 2016/04/04 20:35:24]

Since this is owned by SigninViewController, which is itself owned by Browser, I
assume that browser_ has to be valid for this object to still exist. Does that
make sense?

The active web contents differing between this and creation is fine. We want the
window to hang from the web contents that is active at the moment it's
displayed.

+  }
+}
+
+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,
@@ -86,7 +104,7 @@ views::WebView* SigninViewControllerDelegateViews::CreateGaiaWebView(
   // Adds Gaia signin webview.
   const gfx::Size pref_size =
       switches::UsePasswordSeparatedSigninFlow()
-          ? gfx::Size(kFixedGaiaViewWidth, kFixedGaiaViewHeight)
+          ? gfx::Size(kModalDialogWidth, kFixedGaiaViewHeight)
           : gfx::Size(kPasswordCombinedFixedGaiaViewWidth,
                       kPasswordCombinedFixedGaiaViewHeight);
   views::WebView* web_view = new views::WebView(profile);
@@ -110,7 +128,7 @@ SigninViewControllerDelegateViews::CreateSyncConfirmationWebView(
   views::WebView* web_view = new views::WebView(profile);
   web_view->LoadInitialURL(GURL(chrome::kChromeUISyncConfirmationURL));
   web_view->SetPreferredSize(
-      gfx::Size(kSyncConfirmationDialogWidth, kSyncConfirmationDialogHeight));
+      gfx::Size(kModalDialogWidth, kSyncConfirmationDialogHeight));
 
   return web_view;
 }
@@ -125,7 +143,7 @@ SigninViewControllerDelegate::CreateModalSigninDelegate(
       signin_view_controller,
       SigninViewControllerDelegateViews::CreateGaiaWebView(
           nullptr, mode, browser->profile(), access_point),
-      browser);
+      browser, false);
 }
 
 SigninViewControllerDelegate*
@@ -136,5 +154,5 @@ SigninViewControllerDelegate::CreateSyncConfirmationDelegate(
       signin_view_controller,
       SigninViewControllerDelegateViews::CreateSyncConfirmationWebView(
           browser->profile()),
-      browser);
+      browser, true);
 }