Better fix for Lion dictionary popover cmd-W bug.

chrome/browser/ui/cocoa/fullscreen_window.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/fullscreen_window.h"
 
-#import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/themed_window.h"
 
 @implementation FullscreenWindow
 
 // Make sure our designated initializer gets called.
 - (id)init {
   return [self initForScreen:[NSScreen mainScreen]];
 }
 
 - (id)initForScreen:(NSScreen*)screen {
@@ skipping 48 matching lines @@
 }
 
 - (void)resignMainWindow {
   [super resignMainWindow];
   [self setBackgroundColor:[NSColor windowBackgroundColor]];
 }
 
 // We need our own version, since the default one wants to flash the close
 // button (and possibly other things), which results in nothing happening.
 - (void)performClose:(id)sender {
-  id delegate = [self delegate];
-
-  // Route -performClose: to -commandDispatch: on the delegate when coming from
-  // the "close tab" menu item. See comment in chrome_browser_window.mm.
-  if ([self performCloseShouldRouteToCommandDispatch:sender]) {
-    [delegate commandDispatch:sender];
-    return;
-  }
+  BOOL shouldClose = YES;
 
   // If applicable, check if this window should close.
-  BOOL shouldClose = YES;
+  id delegate = [self delegate];
   if ([delegate respondsToSelector:@selector(windowShouldClose:)])
     shouldClose = [delegate windowShouldClose:self];
 
   if (shouldClose) {
     [self close];
   }
 }
 
 - (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item {
   SEL action = [item action];
 
   // Explicitly enable |-performClose:| (see above); otherwise the fact that
   // this window does not have a close button results in it being disabled.
   if (action == @selector(performClose:))
     return YES;
 
   return [super validateUserInterfaceItem:item];
 }
 
 @end