[Mac] Factor out keyboard shortcut handling from ChromeEventProcessingWindow.

chrome/browser/ui/cocoa/browser_window_utils.mm

 // Copyright (c) 2011 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/browser_window_utils.h"
 
 #include <Carbon/Carbon.h>
 
 #include "base/logging.h"
+#import "base/mac/foundation_util.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/global_keyboard_shortcuts_mac.h"
 #include "chrome/browser/ui/browser.h"
+#import "chrome/browser/ui/cocoa/chrome_command_dispatch_delegate.h"
 #import "chrome/browser/ui/cocoa/chrome_event_processing_window.h"
 #import "chrome/browser/ui/cocoa/tabs/tab_strip_controller.h"
 #include "content/public/browser/native_web_keyboard_event.h"
 
 using content::NativeWebKeyboardEvent;
 
 @implementation BrowserWindowUtils
 + (BOOL)shouldHandleKeyboardEvent:(const NativeWebKeyboardEvent&)event {
   if (event.skip_in_browser || event.type == NativeWebKeyboardEvent::Char)
     return NO;
   DCHECK(event.os_event != NULL);
   return YES;
 }
 
 + (int)getCommandId:(const NativeWebKeyboardEvent&)event {
   return CommandForKeyEvent(event.os_event);
 }
 
 + (BOOL)handleKeyboardEvent:(NSEvent*)event
                    inWindow:(NSWindow*)window {
   ChromeEventProcessingWindow* event_window =
-      static_cast<ChromeEventProcessingWindow*>(window);
-  DCHECK([event_window isKindOfClass:[ChromeEventProcessingWindow class]]);
+      base::mac::ObjCCastStrict<ChromeEventProcessingWindow>(window);
+  ChromeCommandDispatchDelegate* command_delegate =
+      base::mac::ObjCCastStrict<ChromeCommandDispatchDelegate>(
+          [event_window commandDelegate]);
 
   // 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 |-redispatchKeyEvent:| call would take care
     // of invoking the original menu item shortcut as well.
 
     if ([[NSApp mainMenu] performKeyEquivalent:event])
       return true;
 
-    if ([event_window handleExtraKeyboardShortcut:event])
+    if ([command_delegate handleExtraKeyboardShortcut:event window:window])

[tapted, 2015/07/31 03:06:49]

If it's cleaner, I think it's OK to leave handleExtraKeyboardShortcut: as a
method on CEPW. Since, this seems to be the only thing that wants the
commandDelegate accessor. This avoids exposing
chrome_command_dispatch_delegate.h (i.e. you can remove the #import as well)

[jackhou1, 2015/08/04 01:03:58]

Done.

       return true;
   }
 
   return [event_window redispatchKeyEvent:event];
 }
 
 + (NSString*)scheduleReplaceOldTitle:(NSString*)oldTitle
                         withNewTitle:(NSString*)newTitle
                            forWindow:(NSWindow*)window {
   if (oldTitle)
@@ skipping 67 matching lines @@
 + (void)activateWindowForController:(NSWindowController*)controller {
   // Per http://crbug.com/73779 and http://crbug.com/75223, we need this to
   // properly activate windows if Chrome is not the active application.
   [[controller window] makeKeyAndOrderFront:controller];
   ProcessSerialNumber psn;
   GetCurrentProcess(&psn);
   SetFrontProcessWithOptions(&psn, kSetFrontProcessFrontWindowOnly);
 }
 
 @end