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

chrome/browser/ui/cocoa/tabs/tab_window_controller.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.
 
 #import "chrome/browser/ui/cocoa/tabs/tab_window_controller.h"
 
 #include "base/logging.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_view.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 #import "ui/base/cocoa/focus_tracker.h"
@@ skipping 69 matching lines @@
 }
 
 // Return the appropriate tab strip based on whether or not side tabs are
 // enabled.
 - (TabStripView*)tabStripView {
   return tabStripView_;
 }
 
 - (void)removeOverlay {
   [self setUseOverlay:NO];
-  if (closeDeferred_)
+  if (closeDeferred_) {
+    // See comment in BrowserWindowCocoa::Close() about orderOut:.
+    [[self window] orderOut:self];
     [[self window] performClose:self];  // Autoreleases the controller.
+  }
 }
 
 - (void)showOverlay {
   [self setUseOverlay:YES];
 }
 
 // if |useOverlay| is true, we're moving views into the overlay's content
 // area. If false, we're moving out of the overlay back into the window's
 // content.
 - (void)moveViewsBetweenWindowAndOverlay:(BOOL)useOverlay {
@@ skipping 182 matching lines @@
   closeDeferred_ = YES;
 }
 
 // Called when the size of the window content area has changed. Override to
 // position specific views. Base class implementation does nothing.
 - (void)layoutSubviews {
   NOTIMPLEMENTED();
 }
 
 @end