Mac: the return of the tab-modal-sheets patch.

chrome/browser/login_prompt_mac.mm

 // Copyright (c) 2009 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/login_prompt.h"
 #import "chrome/browser/login_prompt_mac.h"
 
 #include "app/l10n_util.h"
 #include "base/mac_util.h"
 #include "base/sys_string_conversions.h"
@@ skipping 62 matching lines @@
                                        const std::wstring& password) {
     [sheet_controller_ autofillLogin:base::SysWideToNSString(username)
                             password:base::SysWideToNSString(password)];
   }
 
   // LoginHandler:
   virtual void BuildViewForPasswordManager(PasswordManager* manager,
                                            std::wstring explanation) {
     DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
 
+    // TODO(viettrungluu): Is this still necessary with thakis's queuing? Let's
+    // hypothesize "no", but I need to check this....
+#if 0
+    TabContents* requesting_contents = GetTabContentsForLogin();
+    DCHECK(requesting_contents);
+
+    // If something goes wrong (e.g., there's already a tab-modal sheet up),
+    // cancel the authorization.
+    if (!requesting_contents ||
+        !requesting_contents->CanCreateConstrainedDialog()) {
+      CancelAuth();
+      return;
+    }
+#endif
+
     // Load nib here instead of in constructor.
     sheet_controller_ = [[[LoginHandlerSheet alloc]
         initWithLoginHandler:this] autorelease];
     init([sheet_controller_ window], sheet_controller_,
           @selector(sheetDidEnd:returnCode:contextInfo:));
 
     SetModel(manager);
 
     [sheet_controller_ setExplanation:base::SysWideToNSString(explanation)];
 
@@ skipping 270 matching lines @@
        sizeToFitFixedWidthTextField:explanationField_];
 
   // Resize the window (no shifting needed due to window layout).
   NSSize windowDelta = NSMakeSize(0, explanationShift);
   [GTMUILocalizerAndLayoutTweaker
       resizeWindowWithoutAutoResizingSubViews:[self window]
                                         delta:windowDelta];
 }
 
 @end