[Mac] Move UI item validation to UserInterfaceItemCommandHandler.

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 {
  @private
   base::scoped_nsobject<CommandDispatcher> commandDispatcher_;
+  id<UserInterfaceItemCommandHandler> commandHandler_;
 }
 
 - (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;
 }
 
 // Public methods.
 
-- (void)setCommandDispatcherDelegate:(id<CommandDispatcherDelegate>)delegate {
+- (void)setCommandDispatcherDelegate:
+    (id<CommandDispatcherDelegate, UserInterfaceItemCommandHandler>)delegate {
   [commandDispatcher_ setDelegate:delegate];
+  commandHandler_ = delegate;
 }
 
 // Private methods.
 
 - (ViewsNSWindowDelegate*)viewsNSWindowDelegate {
   return base::mac::ObjCCastStrict<ViewsNSWindowDelegate>([self delegate]);
 }
 
 - (views::Widget*)viewsWidget {
   return [[self viewsNSWindowDelegate] nativeWidgetMac]->GetWidget();
@@ skipping 106 matching lines @@
 // CommandDispatchingWindow implementation.
 
 - (BOOL)redispatchKeyEvent:(NSEvent*)event {
   return [commandDispatcher_ redispatchKeyEvent:event];
 }
 
 - (BOOL)defaultPerformKeyEquivalent:(NSEvent*)event {
   return [super performKeyEquivalent:event];
 }
 
+- (void)commandDispatch:(id)sender {
+  [commandHandler_ commandDispatch:sender window:self];
+}
+
+- (void)commandDispatchUsingKeyModifiers:(id)sender {
+  [commandHandler_ commandDispatchUsingKeyModifiers:sender window:self];
+}
+
+// NSWindow overrides (NSUserInterfaceItemValidations implementation)
+
+- (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item {
+  return [commandHandler_ validateUserInterfaceItem:item window:self] &&
+         [super validateUserInterfaceItem:item];
+}
+
 @end