Fix BrowserKeyEventsTest.ReservedAccelerators on Mac 10.6

chrome/browser/ui/cocoa/browser_window_cocoa.mm

 // Copyright (c) 2010 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 "app/l10n_util_mac.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
@@ skipping 447 matching lines @@
 + (NSMenuItem*)itemForKeyEquivalent:(NSEvent*)key
                                menu:(NSMenu*)menu {
   NSMenuItem* result = nil;
 
   for (NSMenuItem *item in [menu itemArray]) {
     NSMenu* submenu = [item submenu];
     if (submenu) {
       if (submenu != [NSApp servicesMenu])
         result = [self itemForKeyEquivalent:key
                                        menu:submenu];
-    } else if ([item cr_firesForKeyEvent:key]) {
+    } else if ([item cr_firesForKeyEventIfEnabled:key]) {
       result = item;
     }
 
     if (result)
       break;
   }
 
   return result;
 }
 @end
@@ skipping 150 matching lines @@
 
 NSWindow* BrowserWindowCocoa::window() const {
   return [controller_ window];
 }
 
 void BrowserWindowCocoa::UpdateSidebarForContents(TabContents* tab_contents) {
   if (tab_contents == browser_->GetSelectedTabContents()) {
     [controller_ updateSidebarForContents:tab_contents];
   }
 }