Allow Widget to pass accelerator handling to its parent.

ui/views/widget/native_widget_mac.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.
 
 #include "ui/views/widget/native_widget_mac.h"
 
 #import <Cocoa/Cocoa.h>
 
 #include <utility>
 
 #import "base/mac/bind_objc_block.h"
 #include "base/mac/foundation_util.h"
 #include "base/mac/scoped_nsobject.h"
 #include "base/strings/sys_string_conversions.h"
 #include "base/threading/thread_task_runner_handle.h"
 #import "ui/base/cocoa/constrained_window/constrained_window_animation.h"
 #import "ui/base/cocoa/window_size_constants.h"
 #include "ui/gfx/font_list.h"
 #import "ui/gfx/mac/coordinate_conversion.h"
 #import "ui/gfx/mac/nswindow_frame_controls.h"
 #include "ui/native_theme/native_theme.h"
 #include "ui/native_theme/native_theme_mac.h"
 #import "ui/views/cocoa/bridged_content_view.h"
 #import "ui/views/cocoa/bridged_native_widget.h"
 #include "ui/views/cocoa/cocoa_mouse_capture.h"
 #import "ui/views/cocoa/drag_drop_client_mac.h"
+#import "ui/views/cocoa/native_widget_mac_accelerator_handler.h"
 #import "ui/views/cocoa/native_widget_mac_nswindow.h"
 #import "ui/views/cocoa/views_nswindow_delegate.h"
 #include "ui/views/widget/drop_helper.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/views/window/native_frame_view.h"
 
 // Self-owning animation delegate that starts a hide animation, then calls
 // -[NSWindow close] when the animation ends, releasing itself.
 @interface ViewsNSWindowCloseAnimator : NSObject<NSAnimationDelegate> {
  @private
@@ skipping 77 matching lines @@
   return
       [view convertPoint:NSMakePoint(0, NSHeight([view frame])) toView:nil].y;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // NativeWidgetMac, internal::NativeWidgetPrivate implementation:
 
 void NativeWidgetMac::InitNativeWidget(const Widget::InitParams& params) {
   ownership_ = params.ownership;
   name_ = params.name;
-  base::scoped_nsobject<NSWindow> window([CreateNSWindow(params) retain]);
+  NativeWidgetMacNSWindow* ns_window = CreateNSWindow(params);
+  base::scoped_nsobject<NSWindow> window([ns_window retain]);

[tapted, 2017/01/02 23:11:49]

if you are just after the concrete type, you can make this a
base::scoped_nsobject<NativeWidgetMacNSWindow>

   [window setReleasedWhenClosed:NO];  // Owned by scoped_nsobject.
+
+  if (params.parent && params.pass_accelerator_to_parent) {

[tapted, 2017/01/02 23:11:49]

I don't think we need params.pass_accelerator_to_parent . Here I'd try something
like

if (![window commandHandler] &&
    [[params.parent window]
conformsToProtocol:@protcol(CommandDispatchingWindow)) {
  id<CommandDispatchingWindow> command_window = [params.parent window];
  [window setCommandHandler:[command_window commandHandler]];
}

+    if (auto* bridge =
+            NativeWidgetMac::GetBridgeForNativeWindow([params.parent window])) {
+      DCHECK(bridge->ns_window());
+      [ns_window setCommandHandler:[[[NativeWidgetMacAcceleratorHandler alloc]
+                                       initWithParentWindow:bridge->ns_window()]
+                                       autorelease]];
+    }
+  }
+
   bridge_->Init(window, params);
 
   // Only set always-on-top here if it is true since setting it may affect how
   // the window is treated by Expose.
   if (params.keep_on_top)
     SetAlwaysOnTop(true);
 
   delegate_->OnNativeWidgetCreated(true);
 
   bridge_->SetFocusManager(GetWidget()->GetFocusManager());
@@ skipping 642 matching lines @@
   [[ViewsNSWindowCloseAnimator alloc] initWithWindow:window];
 }
 
 - (void)animationDidEnd:(NSAnimation*)animation {
   [window_ close];
   [animation_ setDelegate:nil];
   [self release];
 }
 
 @end