Better fix for Lion dictionary popover cmd-W bug.

chrome/browser/app_controller_mac.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/app_controller_mac.h"
 
 #include "base/auto_reset.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/file_path.h"
@@ skipping 71 matching lines @@
 // the 10.5 SDK.
 #if !defined(MAC_OS_X_VERSION_10_6) || \
     MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_6
 @interface NSApplication (SnowLeopardSDKDeclarations)
 - (void)setHelpMenu:(NSMenu*)helpMenu;
 @end
 #endif
 
 namespace {
 
+// Declare notification names from the 10.7 SDK.
+#if !defined(MAC_OS_X_VERSION_10_7) || \
+    MAC_OS_X_VERSION_MAX_ALLOWED < MAC_OS_X_VERSION_10_7
+NSString* NSPopoverDidShowNotification = @"NSPopoverDidShowNotification";
+NSString* NSPopoverDidCloseNotification = @"NSPopoverDidCloseNotification";
+#endif
+
 // True while AppController is calling Browser::OpenEmptyWindow(). We need a
 // global flag here, analogue to BrowserInit::InProcessStartup() because
 // otherwise the SessionService will try to restore sessions when we make a new
 // window while there are no other active windows.
 bool g_is_opening_new_window = false;
 
 // Activates a browser window having the given profile (the last one active) if
 // possible and returns a pointer to the activate |Browser| or NULL if this was
 // not possible. If the last active browser is minimized (in particular, if
 // there are only minimized windows), it will unminimize it.
@@ skipping 83 matching lines @@
 @end
 
 @implementation AppController
 
 @synthesize startupComplete = startupComplete_;
 
 // This method is called very early in application startup (ie, before
 // the profile is loaded or any preferences have been registered). Defer any
 // user-data initialization until -applicationDidFinishLaunching:.
 - (void)awakeFromNib {
-}
-
-// This method is called very early in application startup (ie, before
-// the profile is loaded or any preferences have been registered), just
-// after -awakeFromNib. This is separate from -awakeFromNib: so that
-// test code can load nibs without these side effects.
-- (void)registerEventHandlersAndInitialize {
   // We need to register the handlers early to catch events fired on launch.
   NSAppleEventManager* em = [NSAppleEventManager sharedAppleEventManager];
   [em setEventHandler:self
           andSelector:@selector(getUrl:withReply:)
         forEventClass:kInternetEventClass
            andEventID:kAEGetURL];
   [em setEventHandler:self
           andSelector:@selector(submitCloudPrintJob:)
         forEventClass:cloud_print::kAECloudPrintClass
            andEventID:cloud_print::kAECloudPrintClass];
@@ skipping 30 matching lines @@
       addObserver:self
          selector:@selector(windowLayeringDidChange:)
              name:NSWindowDidBecomeMainNotification
            object:nil];
   [notificationCenter
       addObserver:self
          selector:@selector(windowLayeringDidChange:)
              name:NSWindowDidResignMainNotification
            object:nil];
 
+  [notificationCenter

[Robert Sesek, 2012/01/18 17:30:59]

Could wrap this in if (base::mac::IsOSLionOrLater())

[Alexei Svitkine (slow), 2012/01/18 17:57:38]

Done.

+      addObserver:self
+         selector:@selector(popoverDidShow:)
+             name:NSPopoverDidShowNotification
+           object:nil];
+  [notificationCenter
+      addObserver:self
+         selector:@selector(popoverDidClose:)
+             name:NSPopoverDidCloseNotification
+           object:nil];
+
   // Set up the command updater for when there are no windows open
   [self initMenuState];
 
   // Initialize the Profile menu.
   [self initProfileMenu];
 }
 
 - (void)unregisterEventHandlers {
   NSAppleEventManager* em = [NSAppleEventManager sharedAppleEventManager];
   [em removeEventHandlerForEventClass:kInternetEventClass
                            andEventID:kAEGetURL];
   [em removeEventHandlerForEventClass:cloud_print::kAECloudPrintClass
                            andEventID:cloud_print::kAECloudPrintClass];
   [em removeEventHandlerForEventClass:kAECloudPrintInstallClass
                            andEventID:kAECloudPrintInstallClass];
   [em removeEventHandlerForEventClass:kAECloudPrintUninstallClass
                            andEventID:kAECloudPrintUninstallClass];
   [em removeEventHandlerForEventClass:'WWW!'
                            andEventID:'OURL'];
   [[NSNotificationCenter defaultCenter] removeObserver:self];
 }
 
-- (void)dealloc {
-  if ([NSApp delegate] == self)
-    [NSApp setDelegate:nil];
-  [super dealloc];
-}
-
 // (NSApplicationDelegate protocol) This is the Apple-approved place to override
 // the default handlers.
 - (void)applicationWillFinishLaunching:(NSNotification*)notification {
   // Nothing here right now.
 }
 
 - (BOOL)tryToTerminateApplication:(NSApplication*)app {
   // Check for in-process downloads, and prompt the user if they really want
   // to quit (and thus cancel downloads). Only check if we're not already
   // shutting down, else the user might be prompted multiple times if the
@@ skipping 80 matching lines @@
     // proper shutdown. If we don't do this, Chrome won't shut down cleanly,
     // and may end up crashing when some thread tries to use the IO thread (or
     // another thread) that is no longer valid.
     TabRestoreServiceFactory::ResetForProfile([self lastProfile]);
   }
 }
 
 // If the window has a tab controller, make "close window" be cmd-shift-w,
 // otherwise leave it as the normal cmd-w. Capitalization of the key equivalent
 // affects whether the shift modifer is used.
-- (void)adjustCloseWindowMenuItemKeyEquivalent:(BOOL)hasTabs {
-  [closeWindowMenuItem_ setKeyEquivalent:(hasTabs ? @"W" : @"w")];
+- (void)adjustCloseWindowMenuItemKeyEquivalent:(BOOL)enableCloseTabShortcut {
+  [closeWindowMenuItem_ setKeyEquivalent:(enableCloseTabShortcut ? @"W" :
+                                                                   @"w")];
   [closeWindowMenuItem_ setKeyEquivalentModifierMask:NSCommandKeyMask];
 }
 
 // If the window has a tab controller, make "close tab" take over cmd-w,
 // otherwise it shouldn't have any key-equivalent because it should be disabled.
-- (void)adjustCloseTabMenuItemKeyEquivalent:(BOOL)hasTabs {
-  if (hasTabs) {
+- (void)adjustCloseTabMenuItemKeyEquivalent:(BOOL)enableCloseTabShortcut {
+  if (enableCloseTabShortcut) {
     [closeTabMenuItem_ setKeyEquivalent:@"w"];
     [closeTabMenuItem_ setKeyEquivalentModifierMask:NSCommandKeyMask];
   } else {
     [closeTabMenuItem_ setKeyEquivalent:@""];
     [closeTabMenuItem_ setKeyEquivalentModifierMask:0];
   }
 }
 
 // Explicitly remove any command-key equivalents from the close tab/window
 // menus so that nothing can go haywire if we get a user action during pending
@@ skipping 17 matching lines @@
     // window should be the one that handles the close menu item action.
     // Also, there might be a small amount of time where there is no key window;
     // in that case as well, just use our main browser window if there is one.
     // You might think that we should just always use the main window, but the
     // "About Chrome" window serves as a counterexample.
     window = mainWindow;
   }
 
   BOOL hasTabs =
       [[window windowController] isKindOfClass:[TabWindowController class]];
-  [self adjustCloseWindowMenuItemKeyEquivalent:hasTabs];
-  [self adjustCloseTabMenuItemKeyEquivalent:hasTabs];
+  BOOL enableCloseTabShortcut = hasTabs && !hasPopover_;
+  [self adjustCloseWindowMenuItemKeyEquivalent:enableCloseTabShortcut];
+  [self adjustCloseTabMenuItemKeyEquivalent:enableCloseTabShortcut];
 }
 
 // Fix up the "close tab/close window" command-key equivalents. We do this
 // after a delay to ensure that window layer state has been set by the time
 // we do the enabling. This should only be called on the main thread, code that
 // calls this (even as a side-effect) from other threads needs to be fixed.
 - (void)delayedFixCloseMenuItemKeyEquivalents {
   DCHECK([NSThread isMainThread]);
   if (!fileMenuUpdatePending_) {
     // The OS prefers keypresses to timers, so it's possible that a cmd-w
@@ skipping 42 matching lines @@
       [windowController isKindOfClass:[BrowserWindowController class]]) {
     // If the profile is incognito, use the original profile.
     Profile* newProfile = [windowController profile]->GetOriginalProfile();
     [self windowChangedToProfile:newProfile];
   } else if (BrowserList::empty()) {
     [self windowChangedToProfile:
         g_browser_process->profile_manager()->GetLastUsedProfile()];
   }
 }
 
+// Called on Lion and later when a popover (e.g. dictionary) is shown.
+- (void)popoverDidShow:(NSNotification*)notify {
+  hasPopover_ = YES;
+  [self fixCloseMenuItemKeyEquivalents];
+}
+
+// Called on Lion and later when a popover (e.g. dictionary) is closed.
+- (void)popoverDidClose:(NSNotification*)notify {
+  hasPopover_ = NO;
+  [self fixCloseMenuItemKeyEquivalents];
+}
+
 // Called when the user has changed browser windows, meaning the backing profile
 // may have changed. This can cause a rebuild of the user-data menus. This is a
 // no-op if the new profile is the same as the current one. This will always be
 // the original profile and never incognito.
 - (void)windowChangedToProfile:(Profile*)profile {
   if (lastProfile_ == profile)
     return;
 
   // Before tearing down the menu controller bridges, return the Cocoa menus to
   // their initial state.
@@ skipping 602 matching lines @@
   std::vector<GURL> gurlVector;
   gurlVector.push_back(gurl);
 
   [self openUrls:gurlVector];
 }
 
 // Apple Event handler that receives print event from service
 // process, gets the required data and launches Print dialog.
 - (void)submitCloudPrintJob:(NSAppleEventDescriptor*)event {
   // Pull parameter list out of Apple Event.
-  NSAppleEventDescriptor *paramList =
+  NSAppleEventDescriptor* paramList =
       [event paramDescriptorForKeyword:cloud_print::kAECloudPrintClass];
 
   if (paramList != nil) {
     // Pull required fields out of parameter list.
     NSString* mime = [[paramList descriptorAtIndex:1] stringValue];
     NSString* inputPath = [[paramList descriptorAtIndex:2] stringValue];
     NSString* printTitle = [[paramList descriptorAtIndex:3] stringValue];
     NSString* printTicket = [[paramList descriptorAtIndex:4] stringValue];
     // Convert the title to UTF 16 as required.
     string16 title16 = base::SysNSStringToUTF16(printTitle);
@@ skipping 152 matching lines @@
 }
 
 - (void)clearStartupUrls {
   startupUrls_.clear();
 }
 
 - (BookmarkMenuBridge*)bookmarkMenuBridge {
   return bookmarkMenuBridge_.get();
 }
 
-- (void)applicationDidChangeScreenParameters:(NSNotification *)notification {
+- (void)applicationDidChangeScreenParameters:(NSNotification*)notification {
   // During this callback the working area is not always already updated. Defer.
   [self performSelector:@selector(delayedPanelManagerScreenParametersUpdate)
              withObject:nil
              afterDelay:0];
 }
 
 - (void)delayedPanelManagerScreenParametersUpdate {
   PanelManager::GetInstance()->OnDisplayChanged();
 }
 
@@ skipping 13 matching lines @@
 
 }  // namespace browser
 
 namespace app_controller_mac {
 
 bool IsOpeningNewWindow() {
   return g_is_opening_new_window;
 }
 
 }  // namespace app_controller_mac