[Mac] Move UI item validation to UserInterfaceItemCommandHandler.

ui/base/cocoa/command_dispatcher.h

 // Copyright 2015 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.
 
 #ifndef UI_BASE_COCOA_COMMAND_DISPATCHER_H_
 #define UI_BASE_COCOA_COMMAND_DISPATCHER_H_
 
 #import <Cocoa/Cocoa.h>
 
 #import "base/mac/scoped_nsobject.h"
 #include "ui/base/ui_base_export.h"
 
 @protocol CommandDispatcherDelegate;
 @protocol CommandDispatchingWindow;
+@protocol UserInterfaceItemCommandHandler;
 
 // CommandDispatcher guides the processing of key events to ensure key commands
 // are executed in the appropriate order. In particular, it allows a first
 // responder implementing CommandDispatcherTarget to handle an event
 // asynchronously and return unhandled events via -redispatchKeyEvent:. An
 // NSWindow can use CommandDispatcher by implementing CommandDispatchingWindow
 // and overriding -[NSWindow performKeyEquivalent:] and -[NSWindow sendEvent:]
 // to call the respective CommandDispatcher methods.
 UI_BASE_EXPORT @interface CommandDispatcher : NSObject
 
@@ skipping 49 matching lines @@
 // Called after the default -performKeyEquivalent:. |window| is the
 // CommandDispatchingWindow that owns CommandDispatcher.
 - (BOOL)postPerformKeyEquivalent:(NSEvent*)event window:(NSWindow*)window;
 
 @end
 
 // The set of methods an NSWindow subclass needs to implement to use
 // CommandDispatcher.
 @protocol CommandDispatchingWindow
 
+@property(assign, nonatomic) id<UserInterfaceItemCommandHandler> commandHandler;
+
 // This can be implemented with -[CommandDispatcher redispatchKeyEvent:]. It's
 // so that callers can simply return events to the NSWindow.
 - (BOOL)redispatchKeyEvent:(NSEvent*)event;
 
 // Short-circuit to the default -[NSResponder performKeyEquivalent:] which
 // CommandDispatcher calls as part of its -performKeyEquivalent: flow.
 - (BOOL)defaultPerformKeyEquivalent:(NSEvent*)event;
 
+// AppKit will call -[NSUserInterfaceValidations validateUserInterfaceItem:] to
+// validate UI items. Any item whose target is FirstResponder, or nil, will
+// traverse the responder chain looking for a responder that implements the
+// item's selector. Thus NSWindow is usually the last to be checked and will
+// handle any items that are not validated elsewhere in the chain. Implement the
+// following so that menu items with these selectors are validated by
+// CommandDispatchingWindow.
+- (void)commandDispatch:(id)sender;
+- (void)commandDispatchUsingKeyModifiers:(id)sender;
+
+@end
+
+// Used by CommandDispatchingWindow to implement UI item validation.
+@protocol UserInterfaceItemCommandHandler

[tapted, 2015/09/04 02:56:24]

since this is more optional, perhaps it should be a separate file?

[jackhou1, 2015/09/04 06:13:59]

Done.

+
+// Called by CommandDispatchingWindow to validate menu and toolbar items. All
+// the items we care about have been set with the -commandDispatch or
+// -commandDispatchUsingKeyModifiers selectors and a target of FirstResponder in
+// IB. If it's not one of those, it should be handled elsewhere in the responder
+// chain.
+- (BOOL)validateUserInterfaceItem:(id<NSValidatedUserInterfaceItem>)item
+                           window:(NSWindow*)window;
+
+// Called by CommandDispatchingWindow to execute commands. This assumes that the
+// command is supported and doesn't check, otherwise it would have been disabled
+// in the UI in validateUserInterfaceItem:.
+- (void)commandDispatch:(id)sender window:(NSWindow*)window;
+
+// Same as |-commandDispatch:|, but executes commands using a disposition
+// determined by the key flags. If the window is in the background and the
+// command key is down, ignore the command key, but process any other modifiers.
+- (void)commandDispatchUsingKeyModifiers:(id)sender window:(NSWindow*)window;
+
 @end
 
 #endif  // UI_BASE_COCOA_COMMAND_DISPATCHER_H_