Avoid multiple displays of the sign-in dialogs.

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"
@@ skipping 31 matching lines @@
     SigninViewController* signin_view_controller,
     std::unique_ptr<views::WebView> content_view,
     Browser* browser,
     ui::ModalType dialog_modal_type,
     bool wait_for_size)
     : SigninViewControllerDelegate(signin_view_controller,
                                    content_view->GetWebContents()),
       content_view_(content_view.release()),
       modal_signin_widget_(nullptr),
       dialog_modal_type_(dialog_modal_type),
-      wait_for_size_(wait_for_size),
       browser_(browser) {
   DCHECK(browser_);
   DCHECK(browser_->tab_strip_model()->GetActiveWebContents())
       << "A tab must be active to present the sign-in modal dialog.";
   DCHECK(dialog_modal_type == ui::MODAL_TYPE_CHILD ||
          dialog_modal_type == ui::MODAL_TYPE_WINDOW)
       << "Unsupported dialog modal type " << dialog_modal_type;
-  if (!wait_for_size_)
+  if (!wait_for_size)
     DisplayModal();
 }
 
 SigninViewControllerDelegateViews::~SigninViewControllerDelegateViews() {}
 
 // views::DialogDelegateView:
 views::View* SigninViewControllerDelegateViews::GetContentsView() {
   return content_view_;
 }
 
@@ skipping 29 matching lines @@
 
 void SigninViewControllerDelegateViews::ResizeNativeView(int 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_) {
+  if (!modal_signin_widget_) {
     // The modal wasn't displayed yet so just show it with the already resized
     // view.
     DisplayModal();
   }
 }
 
 void SigninViewControllerDelegateViews::DisplayModal() {
+  DCHECK(!modal_signin_widget_);
+
   content::WebContents* host_web_contents =
       browser_->tab_strip_model()->GetActiveWebContents();
 
   // Avoid displaying the sign-in modal view if there are no active web
   // contents. This happens if the user closes the browser window before this
   // dialog has a chance to be displayed.
   if (!host_web_contents)
     return;
 
   gfx::NativeWindow window = host_web_contents->GetTopLevelNativeWindow();
@@ skipping 108 matching lines @@
 
 SigninViewControllerDelegate*
 SigninViewControllerDelegate::CreateSigninErrorDelegate(
     SigninViewController* signin_view_controller,
     Browser* browser) {
   return new SigninViewControllerDelegateViews(
       signin_view_controller,
       SigninViewControllerDelegateViews::CreateSigninErrorWebView(browser),
       browser, ui::MODAL_TYPE_WINDOW, true);
 }