Fix conflicts between accelerator keys and HTML DOM accesskeys....

chrome/browser/tab_contents/tab_contents_view_mac.mm

 // Copyright (c) 2006-2008 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 <Carbon/Carbon.h>
 
 #include "chrome/browser/tab_contents/tab_contents_view_mac.h"
 
 #include <string>
 
@@ skipping 28 matching lines @@
 COMPILE_ASSERT_MATCHING_ENUM(DragOperationCopy);
 COMPILE_ASSERT_MATCHING_ENUM(DragOperationLink);
 COMPILE_ASSERT_MATCHING_ENUM(DragOperationGeneric);
 COMPILE_ASSERT_MATCHING_ENUM(DragOperationPrivate);
 COMPILE_ASSERT_MATCHING_ENUM(DragOperationMove);
 COMPILE_ASSERT_MATCHING_ENUM(DragOperationDelete);
 COMPILE_ASSERT_MATCHING_ENUM(DragOperationEvery);
 
 @interface TabContentsViewCocoa (Private)
 - (id)initWithTabContentsViewMac:(TabContentsViewMac*)w;
-- (void)processKeyboardEvent:(NativeWebKeyboardEvent*)event;
+- (BOOL)processKeyboardEvent:(NativeWebKeyboardEvent*)event;
 - (void)registerDragTypes;
 - (void)setCurrentDragOperation:(NSDragOperation)operation;
 - (void)startDragWithDropData:(const WebDropData&)dropData
             dragOperationMask:(NSDragOperation)operationMask;
 @end
 
 // static
 TabContentsView* TabContentsView::Create(TabContents* tab_contents) {
   return new TabContentsViewMac(tab_contents);
 }
@@ skipping 145 matching lines @@
 // This is called when we the renderer asks us to take focus back (i.e., it has
 // iterated past the last focusable element on the page).
 void TabContentsViewMac::TakeFocus(bool reverse) {
   if (reverse) {
     [[cocoa_view_ window] selectPreviousKeyView:cocoa_view_.get()];
   } else {
     [[cocoa_view_ window] selectNextKeyView:cocoa_view_.get()];
   }
 }
 
-void TabContentsViewMac::HandleKeyboardEvent(
+bool TabContentsViewMac::HandleKeyboardEvent(
     const NativeWebKeyboardEvent& event) {
-  [cocoa_view_.get() processKeyboardEvent:
-      const_cast<NativeWebKeyboardEvent*>(&event)];
+  return [cocoa_view_.get() processKeyboardEvent:
+      const_cast<NativeWebKeyboardEvent*>(&event)] == YES;
 }
 
 void TabContentsViewMac::ShowContextMenu(const ContextMenuParams& params) {
   RenderViewContextMenuMac menu(tab_contents(),
                                 params,
                                 GetNativeView());
   menu.Init();
 }
 
 RenderWidgetHostView* TabContentsViewMac::CreateNewWidgetInternal(
@@ skipping 74 matching lines @@
 }
 
 - (void)setCurrentDragOperation:(NSDragOperation)operation {
   [dropTarget_ setCurrentOperation:operation];
 }
 
 - (TabContents*)tabContents {
   return tabContentsView_->tab_contents();
 }
 
-- (void)processKeyboardEvent:(NativeWebKeyboardEvent*)wkEvent {
+- (BOOL)processKeyboardEvent:(NativeWebKeyboardEvent*)wkEvent {
   if (wkEvent->skip_in_browser)
-    return;
+    return NO;
 
   NSEvent* event = wkEvent->os_event;
 
   if (!event) {
     // Char events are synthesized and do not contain a real event. We are not
     // interested in them anyway.
     DCHECK(wkEvent->type == WebKit::WebInputEvent::Char);
-    return;
+    return NO;
   }
 
   // If this tab is no longer active, its window will be |nil|. In that case,
   // best ignore the event.
   if (![self window])
-    return;
+    return NO;
   ChromeEventProcessingWindow* window =
       (ChromeEventProcessingWindow*)[self window];
   DCHECK([window isKindOfClass:[ChromeEventProcessingWindow class]]);
 
   // Do not fire shortcuts on key up.
   if ([event type] == NSKeyDown) {
     if ([window handleExtraBrowserKeyboardShortcut:event])
-      return;
+      return YES;
     if ([window handleExtraWindowKeyboardShortcut:event])
-      return;
+      return YES;
   }
 
   // We need to re-dispatch the event, so that it is sent to the menu or other
   // cocoa mechanisms (such as the cmd-` handler).
   RenderWidgetHostViewCocoa* rwhv = static_cast<RenderWidgetHostViewCocoa*>(
       tabContentsView_->GetContentNativeView());
   DCHECK([rwhv isKindOfClass:[RenderWidgetHostViewCocoa class]]);
   [rwhv setIgnoreKeyEvents:YES];
-  [window redispatchEvent:event];
+  BOOL eventHandled = [window redispatchEvent:event];
   [rwhv setIgnoreKeyEvents:NO];
+  return eventHandled;
 }
 
 - (void)mouseEvent:(NSEvent *)theEvent {
   TabContents* tabContents = [self tabContents];
   if (tabContents->delegate()) {
     if ([theEvent type] == NSMouseMoved)
       tabContents->delegate()->ContentsMouseEvent(tabContents, true);
     if ([theEvent type] == NSMouseExited)
       tabContents->delegate()->ContentsMouseEvent(tabContents, false);
   }
@@ skipping 94 matching lines @@
 }
 
 - (BOOL)performDragOperation:(id<NSDraggingInfo>)sender {
   return [dropTarget_ performDragOperation:sender view:self];
 }
 
 // Tons of stuff goes here, where we grab events going on in Cocoaland and send
 // them into the C++ system. TODO(avi): all that jazz
 
 @end