[Mac] Factor out keyboard shortcut handling from ChromeEventProcessingWindow.

ui/views/cocoa/native_widget_mac_nswindow.mm

 // Copyright 2014 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 "ui/views/cocoa/native_widget_mac_nswindow.h"
 
 #include "base/mac/foundation_util.h"
 #import "ui/views/cocoa/views_nswindow_delegate.h"
 #include "ui/views/controls/menu/menu_controller.h"
 #include "ui/views/widget/native_widget_mac.h"
 #include "ui/views/widget/widget_delegate.h"
 
 @interface NativeWidgetMacNSWindow ()
 - (ViewsNSWindowDelegate*)viewsNSWindowDelegate;
 - (views::Widget*)viewsWidget;
 - (BOOL)hasViewsMenuActive;
 
 // Private API on NSWindow, determines whether the title is drawn on the title
 // bar. The title is still visible in menus, Expose, etc.
 - (BOOL)_isTitleHidden;
 @end
 
 @implementation NativeWidgetMacNSWindow
 
+- (instancetype)initWithContentRect:(NSRect)contentRect
+                          styleMask:(NSUInteger)windowStyle
+                            backing:(NSBackingStoreType)bufferingType
+                              defer:(BOOL)deferCreation {
+  if ((self = [super initWithContentRect:contentRect
+                               styleMask:windowStyle
+                                 backing:bufferingType
+                                   defer:deferCreation])) {
+    commandDispatcher_.reset([[CommandDispatcher alloc] initWithOwner:self]);
+  }
+  return self;
+}
+
 - (ViewsNSWindowDelegate*)viewsNSWindowDelegate {
   return base::mac::ObjCCastStrict<ViewsNSWindowDelegate>([self delegate]);
 }
 
 - (views::Widget*)viewsWidget {
   return [[self viewsNSWindowDelegate] nativeWidgetMac]->GetWidget();
 }
 
 - (BOOL)hasViewsMenuActive {
   views::MenuController* menuController =
@@ skipping 22 matching lines @@
 
   // Dialogs shouldn't take large shadows away from their parent window.
   views::Widget* widget = [self viewsWidget];
   return widget->CanActivate() && !widget->IsDialogBox();
 }
 
 // Override sendEvent to allow key events to be forwarded to a toolkit-views
 // menu while it is active, and while still allowing any native subview to
 // retain firstResponder status.
 - (void)sendEvent:(NSEvent*)event {
+  // Let CommandDispatcher check if this is a redispatched event.
+  if ([commandDispatcher_ preSendEvent:event])
+    return;
+
   NSEventType type = [event type];
   if ((type != NSKeyDown && type != NSKeyUp) || ![self hasViewsMenuActive]) {
     [super sendEvent:event];
     return;
   }
 
   // Send to the menu, after converting the event into an action message using
   // the content view.
   if (type == NSKeyDown)
     [[self contentView] keyDown:event];
@@ skipping 20 matching lines @@
 // when ordering in a window for the first time.
 - (void)orderWindow:(NSWindowOrderingMode)orderingMode
          relativeTo:(NSInteger)otherWindowNumber {
   [[self viewsNSWindowDelegate] onWindowOrderWillChange:orderingMode];
   [super orderWindow:orderingMode relativeTo:otherWindowNumber];
   [[self viewsNSWindowDelegate] onWindowOrderChanged:nil];
 }
 
 // NSResponder implementation.
 
+- (BOOL)performKeyEquivalent:(NSEvent*)event {
+  return [commandDispatcher_ performKeyEquivalent:event];
+}
+
 - (void)cursorUpdate:(NSEvent*)theEvent {
   // The cursor provided by the delegate should only be applied within the
   // content area. This is because we rely on the contentView to track the
   // mouse cursor and forward cursorUpdate: messages up the responder chain.
   // The cursorUpdate: isn't handled in BridgedContentView because views-style
   // SetCapture() conflicts with the way tracking events are processed for
   // the view during a drag. Since the NSWindow is still in the responder chain
   // overriding cursorUpdate: here handles both cases.
   if (!NSPointInRect([theEvent locationInWindow], [[self contentView] frame])) {
     [super cursorUpdate:theEvent];
     return;
   }
 
   NSCursor* cursor = [[self viewsNSWindowDelegate] cursor];
   if (cursor)
     [cursor set];
   else
     [super cursorUpdate:theEvent];
 }
 
+// CommandDispatcher implementation.
+
+- (BOOL)redispatchKeyEvent:(NSEvent*)event {
+  return [commandDispatcher_ redispatchKeyEvent:event];
+}
+
+- (BOOL)defaultPerformKeyEquivalent:(NSEvent*)event {
+  return [super performKeyEquivalent:event];
+}
+
+// Public methods.

[tapted, 2015/08/26 06:46:54]

nit: new methods before overrides (in the follow-up)

[jackhou1, 2015/08/26 07:38:17]

Done.

+
+- (void)setCommandDispatcherDelegate:(id<CommandDispatcherDelegate>)delegate {
+  [commandDispatcher_ setDelegate:delegate];
+}
+
 @end