Revert 120593 - Ensure the previously active browser window gets the focus after a browser window i…

chrome/browser/ui/cocoa/browser_window_cocoa.mm

 // Copyright (c) 2012 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/browser_window_cocoa.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
@@ skipping 136 matching lines @@
   [window() setFrame:cocoa_bounds display:YES];
 }
 
 // Callers assume that this doesn't immediately delete the Browser object.
 // The controller implementing the window delegate methods called from
 // |-performClose:| must take precautions to ensure that.
 void BrowserWindowCocoa::Close() {
   // If there is an overlay window, we contain a tab being dragged between
   // windows. Don't hide the window as it makes the UI extra confused. We can
   // still close the window, as that will happen when the drag completes.
-  if ([controller_ overlayWindow])
+  if ([controller_ overlayWindow]) {
     [controller_ deferPerformClose];
-  else
+  } else {
+    // Make sure we hide the window immediately. Even though performClose:
+    // calls orderOut: eventually, it leaves the window on-screen long enough
+    // that we start to see tabs shutting down. http://crbug.com/23959
+    // TODO(viettrungluu): This is kind of bad, since |-performClose:| calls
+    // |-windowShouldClose:| (on its delegate, which is probably the
+    // controller) which may return |NO| causing the window to not be closed,
+    // thereby leaving a hidden window. In fact, our window-closing procedure
+    // involves a (indirect) recursion on |-performClose:|, which is also bad.
+    [window() orderOut:controller_];
     [window() performClose:controller_];
+  }
 }
 
 void BrowserWindowCocoa::Activate() {
   [controller_ activate];
 }
 
 void BrowserWindowCocoa::Deactivate() {
   // TODO(jcivelli): http://crbug.com/51364 Implement me.
   NOTIMPLEMENTED();
 }
@@ skipping 456 matching lines @@
   AvatarMenuBubbleController* menu =
       [[AvatarMenuBubbleController alloc] initWithBrowser:browser_
                                                anchoredAt:point];
   [[menu bubble] setAlignment:info_bubble::kAlignEdgeToAnchorEdge];
   [menu showWindow:nil];
 }
 
 void BrowserWindowCocoa::ShowAvatarBubbleFromAvatarButton() {
   [[controller_ avatarButtonController] showAvatarBubble];
 }