Avoid multiple displays of the sign-in dialogs.

chrome/browser/ui/cocoa/profiles/signin_view_controller_delegate_mac.mm

 // 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/cocoa/profiles/signin_view_controller_delegate_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 41 matching lines @@
 
 SigninViewControllerDelegateMac::SigninViewControllerDelegateMac(
     SigninViewController* signin_view_controller,
     std::unique_ptr<content::WebContents> web_contents,
     Browser* browser,
     NSRect frame,
     ui::ModalType dialog_modal_type,
     bool wait_for_size)
     : SigninViewControllerDelegate(signin_view_controller, web_contents.get()),
       web_contents_(std::move(web_contents)),
-      wait_for_size_(wait_for_size),
       browser_(browser),
       dialog_modal_type_(dialog_modal_type),
       window_frame_(frame) {
   DCHECK(browser_);
   DCHECK(browser_->tab_strip_model()->GetActiveWebContents())
       << "A tab must be active to present the sign-in modal dialog.";
 
-  if (!wait_for_size_)
+  if (!wait_for_size)
     DisplayModal();
 }
 
 SigninViewControllerDelegateMac::~SigninViewControllerDelegateMac() {}
 
 void SigninViewControllerDelegateMac::OnConstrainedWindowClosed(
     ConstrainedWindowMac* window) {
   CleanupAndDeleteThis();
 }
 
@@ skipping 80 matching lines @@
         window_.reset(nil);
         CleanupAndDeleteThis();
       }
       break;
     default:
       NOTREACHED() << "Unsupported dialog modal type " << dialog_modal_type_;
   }
 }
 
 void SigninViewControllerDelegateMac::ResizeNativeView(int height) {
-  if (wait_for_size_) {
-    [window_.get().contentView
-        setFrameSize:NSMakeSize(kModalDialogWidth,
-                                height)];
+  if (!window_) {
     window_frame_.size = NSMakeSize(kModalDialogWidth, height);
     DisplayModal();
   }
 }
 
 void SigninViewControllerDelegateMac::DisplayModal() {
+  DCHECK(!window_);
+
   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;
 
   window_.reset(
@@ skipping 69 matching lines @@
 SigninViewControllerDelegate::CreateSigninErrorDelegate(
     SigninViewController* signin_view_controller,
     Browser* browser) {
   return new SigninViewControllerDelegateMac(
       signin_view_controller,
       SigninViewControllerDelegateMac::CreateSigninErrorWebContents(
           browser->profile()),
       browser, NSMakeRect(0, 0, kModalDialogWidth, kSigninErrorDialogHeight),
       ui::MODAL_TYPE_WINDOW, true /* wait_for_size */);
 }