Refactor the keyboard events handling code related to RenderViewHostDelegate:...

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 29 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;
-- (BOOL)processKeyboardEvent:(NativeWebKeyboardEvent*)event;
 - (void)registerDragTypes;
 - (void)setCurrentDragOperation:(NSDragOperation)operation;
 - (void)startDragWithDropData:(const WebDropData&)dropData
             dragOperationMask:(NSDragOperation)operationMask;
 - (void)cancelDeferredClose;
 - (void)closeTabAfterEvent;
 @end
 
 // static
 TabContentsView* TabContentsView::Create(TabContents* tab_contents) {
@@ skipping 163 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()];
   }
 }
 
-bool TabContentsViewMac::HandleKeyboardEvent(
-    const 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(
     int route_id,
     bool activatable) {
@@ skipping 98 matching lines @@
 }
 
 - (void)setCurrentDragOperation:(NSDragOperation)operation {
   [dropTarget_ setCurrentOperation:operation];
 }
 
 - (TabContents*)tabContents {
   return tabContentsView_->tab_contents();
 }
 
-- (BOOL)processKeyboardEvent:(NativeWebKeyboardEvent*)wkEvent {
-  if (wkEvent->skip_in_browser || wkEvent->type == WebKit::WebInputEvent::Char)
-    return NO;
-
-  NSEvent* event = wkEvent->os_event;
-  DCHECK(event != NULL);
-
-  // If this tab is no longer active, its window will be |nil|. In that case,
-  // best ignore the event.
-  if (![self window])
-    return NO;
-  ChromeEventProcessingWindow* window =
-      (ChromeEventProcessingWindow*)[self window];
-  DCHECK([window isKindOfClass:[ChromeEventProcessingWindow class]]);
-
-  // Do not fire shortcuts on key up.
-  if ([event type] == NSKeyDown) {
-    // Send the event to the menu before sending it to the browser/window
-    // shortcut handling, so that if a user configures cmd-left to mean
-    // "previous tab", it takes precedence over the built-in "history back"
-    // binding. Other than that, the |redispatchEvent| call would take care of
-    // invoking the original menu item shortcut as well.
-    if ([[NSApp mainMenu] performKeyEquivalent:event])
-      return YES;
-
-    if ([window handleExtraBrowserKeyboardShortcut:event])
-      return YES;
-    if ([window handleExtraWindowKeyboardShortcut:event])
-      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];
-  BOOL eventHandled = [window redispatchEvent:event];
-  [rwhv setIgnoreKeyEvents:NO];
-  return eventHandled;
-}
-
 - (void)mouseEvent:(NSEvent *)theEvent {
   TabContents* tabContents = [self tabContents];
   if (tabContents->delegate()) {
     NSPoint location = [NSEvent mouseLocation];
     if ([theEvent type] == NSMouseMoved)
       tabContents->delegate()->ContentsMouseEvent(
           tabContents, gfx::Point(location.x, location.y), true);
     if ([theEvent type] == NSMouseExited)
       tabContents->delegate()->ContentsMouseEvent(
           tabContents, gfx::Point(location.x, location.y), false);
@@ skipping 118 matching lines @@
 }
 
 - (void)closeTabAfterEvent {
   tabContentsView_->CloseTab();
 }
 
 // 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