Fix BrowserKeyEventsTest.ReservedAccelerators on Mac 10.6

chrome/browser/ui/cocoa/nsmenuitem_additions.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.
 
 #import "chrome/browser/ui/cocoa/nsmenuitem_additions.h"
 
 #include <Carbon/Carbon.h>
 
 #include "base/logging.h"
 
 @implementation NSMenuItem(ChromeAdditions)
 
 - (BOOL)cr_firesForKeyEvent:(NSEvent*)event {

[Nico, 2010/12/04 20:25:15]

You can then implement this function as

 … {
  if (![self isEnabled])
    return NO;
  return [cr_firesForKeyEventIfEnabled:event];
}

[James Su, 2010/12/06 18:37:28]

Done.

   DCHECK([event type] == NSKeyDown);
-  if (![self isEnabled])
-    return NO;
-
   // In System Preferences->Keyboard->Keyboard Shortcuts, it is possible to add
   // arbitrary keyboard shortcuts to applications. It is not documented how this
   // works in detail, but |NSMenuItem| has a method |userKeyEquivalent| that
   // sounds related.
   // However, it looks like |userKeyEquivalent| is equal to |keyEquivalent| when
   // a user shortcut is set in system preferences, i.e. Cocoa automatically
   // sets/overwrites |keyEquivalent| as well. Hence, this method can ignore
   // |userKeyEquivalent| and check |keyEquivalent| only.
 
   // Menu item key equivalents are nearly all stored without modifiers. The
@@ skipping 66 matching lines @@
   eventModifiers &= NSCommandKeyMask |
                     NSControlKeyMask |
                     NSAlternateKeyMask |
                     NSShiftKeyMask;
 
   return [eventString isEqualToString:[self keyEquivalent]]
       && eventModifiers == [self keyEquivalentModifierMask];
 }
 
 @end