[MacViews] Use ChromeCommandDispatcherDelegate to handle keyboard shortcuts.

chrome/browser/ui/views/apps/app_window_native_widget_mac.mm

Index: chrome/browser/ui/views/apps/app_window_native_widget_mac.mm
diff --git a/chrome/browser/ui/views/apps/app_window_native_widget_mac.mm b/chrome/browser/ui/views/apps/app_window_native_widget_mac.mm
index 1bab9b8373373bc19105d504b911f2a1fee03e52..e21795759d9237c9da3b18d279f709bfea36a777 100644
--- a/chrome/browser/ui/views/apps/app_window_native_widget_mac.mm
+++ b/chrome/browser/ui/views/apps/app_window_native_widget_mac.mm
@@ -6,7 +6,9 @@
 
 #import <Cocoa/Cocoa.h>
 
+#import "base/mac/foundation_util.h"
 #import "chrome/browser/ui/cocoa/apps/titlebar_background_view.h"
+#import "chrome/browser/ui/cocoa/chrome_command_dispatcher_delegate.h"
 #import "chrome/browser/ui/views/frame/native_widget_mac_frameless_nswindow.h"
 #include "extensions/browser/app_window/native_app_window.h"
 #import "ui/base/cocoa/window_size_constants.h"
@@ -14,8 +16,10 @@
 AppWindowNativeWidgetMac::AppWindowNativeWidgetMac(
     views::Widget* widget,
     extensions::NativeAppWindow* native_app_window)
-    : NativeWidgetMac(widget), native_app_window_(native_app_window) {
-}
+    : NativeWidgetMac(widget),
+      native_app_window_(native_app_window),
+      command_dispatcher_delegate_(
+          [[ChromeCommandDispatcherDelegate alloc] init]) {}
 
 AppWindowNativeWidgetMac::~AppWindowNativeWidgetMac() {
 }
@@ -32,6 +36,8 @@ NSWindow* AppWindowNativeWidgetMac::CreateNSWindow(
             activeColor:native_app_window_->ActiveFrameColor()
           inactiveColor:native_app_window_->InactiveFrameColor()];
     }
+    [base::mac::ObjCCastStrict<NativeWidgetMacNSWindow>(ns_window)

[tapted, 2015/08/27 02:58:18]

Should we change the return type of CreateNSWindow to be
NativeWidgetMacNSWindow? That should probably be part of the contract, since
there are lots of assumptions that this is the case.

Also/alternatively, did you consider putting this in OnWidgetCreated()? I don't
know if that's better... and it would make the cast necessary again, but this
seems like something it would make sense to do there (if it works out to be
neater)

[jackhou1, 2015/08/27 22:37:47]

Yeah I considered that, but didn't because native_widget_mac.h is included in
.cc files, like widget_test.h. Would you prefer the #if defined(__OBJC__) vs
casting here?
You mean WidgetObserver::OnWidgetCreated()? It wouldn't work for
AppWindowNativeWidgetMac which isn't a BrowserView.

[tapted, 2015/08/28 01:36:06]

Yeah.. I think so. It's ok just for the forward declare. I think it's more
important that implementors of this override to know that they really do need to
return something that inherits from NativeWidgetMacNSWindow
For App Windows, I think it would need to go on ChromeNativeAppWindowViewsMac --
there's already an OnWidgetCreated override there.

[jackhou1, 2015/08/28 05:15:09]

Done.
 
Actually, I'm not sure what I was talking about. BrowserFrameMac is not a
BrowserView (or other WidgetObserver).

Also, looking at the list of global shortcuts, it doesn't seem like any of them
are relevant to native app windows. Plus native app windows have no UI other
than the WebContents, so they wouldn't trigger anyway. Reverted the changes to
AppWindowNativeWidgetMac.

[tapted, 2015/08/28 05:48:14]

Ah, good point!

+        setCommandDispatcherDelegate:command_dispatcher_delegate_];
     return ns_window;
   }
 
@@ -40,9 +46,12 @@ NSWindow* AppWindowNativeWidgetMac::CreateNSWindow(
   NSUInteger style_mask = NSTexturedBackgroundWindowMask | NSTitledWindowMask |
                           NSClosableWindowMask | NSMiniaturizableWindowMask |
                           NSResizableWindowMask;
-  return [[[NativeWidgetMacFramelessNSWindow alloc]
-      initWithContentRect:ui::kWindowSizeDeterminedLater
-                styleMask:style_mask
-                  backing:NSBackingStoreBuffered
-                    defer:NO] autorelease];
+  base::scoped_nsobject<NativeWidgetMacFramelessNSWindow> ns_window(
+      [[NativeWidgetMacFramelessNSWindow alloc]
+          initWithContentRect:ui::kWindowSizeDeterminedLater
+                    styleMask:style_mask
+                      backing:NSBackingStoreBuffered
+                        defer:NO]);
+  [ns_window setCommandDispatcherDelegate:command_dispatcher_delegate_];
+  return ns_window.autorelease();
 }