MacViews: Fix accelerator handling while Omnibox is in focus.

ui/views/cocoa/bridged_content_view.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/bridged_content_view.h"
 
 #include "base/logging.h"
 #import "base/mac/mac_util.h"
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/sdk_forward_declarations.h"
@@ skipping 742 matching lines @@
     case ui::TEXT_INPUT_TYPE_NONE:
     case ui::TEXT_INPUT_TYPE_PASSWORD:
       return nil;
     default:
       return [super inputContext];
   }
 }
 
 // NSResponder implementation.
 
+- (BOOL)_wantsKeyDownForEvent:(NSEvent*)event {
+  // This is a SPI that AppKit apparently calls after |performKeyEquivalent:|
+  // returned NO. If this function returns |YES|, Cocoa sends the event to
+  // |keyDown:| instead of doing other things with it. Ctrl-tab will be sent
+  // to us instead of doing key view loop control, ctrl-left/right get handled
+  // correctly, etc.
+  // (However, there are still some keys that Cocoa swallows, e.g. the key
+  // equivalent that Cocoa uses for toggling the input language. In this case,
+  // that's actually a good thing, though -- see http://crbug.com/26115 .)
+  return YES;
+}
+
 - (void)keyDown:(NSEvent*)theEvent {
   // Convert the event into an action message, according to OSX key mappings.
   keyDownEvent_ = theEvent;
   [self interpretKeyEvents:@[ theEvent ]];
+
+  if (keyDownEvent_) {

[tapted, 2016/11/18 07:28:04]

comment above: 

  // If |keyDownEvent_| wasn't cleared during -interpretKeyEvents:, it wasn't
  // handled. Give Widget accelerators a chance to handle it.

[themblsha, 2016/11/18 13:31:50]

Done.

+    ui::KeyEvent event(keyDownEvent_);
+    [self handleKeyEvent:&event];
+  }
+
   keyDownEvent_ = nil;
 }
 
 - (void)keyUp:(NSEvent*)theEvent {
   ui::KeyEvent event(theEvent);
   [self handleKeyEvent:&event];
 }
 
 - (void)scrollWheel:(NSEvent*)theEvent {
   if (!hostedView_)
@@ skipping 500 matching lines @@
 
 - (NSUInteger)characterIndexForPoint:(NSPoint)aPoint {
   NOTIMPLEMENTED();
   return 0;
 }
 
 - (void)doCommandBySelector:(SEL)selector {
   // Like the renderer, handle insert action messages as a regular key dispatch.
   // This ensures, e.g., insertTab correctly changes focus between fields.
   if (keyDownEvent_ && [NSStringFromSelector(selector) hasPrefix:@"insert"]) {
     ui::KeyEvent event(keyDownEvent_);

[tapted, 2016/11/18 07:28:04]

Can this just return here? I.e.

  return;  // Handle in -keyDown:.

[themblsha, 2016/11/18 13:31:50]

Yep, should work.

     [self handleKeyEvent:&event];
+    keyDownEvent_ = nil;
     return;
   }
 
-  if ([self respondsToSelector:selector])
+  if ([self respondsToSelector:selector]) {
     [self performSelector:selector withObject:nil];
-  else
-    [[self nextResponder] doCommandBySelector:selector];
+    keyDownEvent_ = nil;
+    return;
+  }
+
+  if (keyDownEvent_) {

[tapted, 2016/11/18 07:28:04]

This needs a comment to say why it can't be done in keyDown

Something like

// For events that AppKit sends via doCommandBySelector:, first attempt to
// handle as a Widget accelerator. Forward along the responder chain only if the
// Widget doesn't handle it.


See how you feel about a helper method like

- (BOOL)handleUnhandledKeyDownAsKeyEvent {
  if (!keyDownEvent_)
    return NO;

  ui::KeyEvent event(keyDownEvent_);
  [self handleKeyEvent:&event];
  keyDownEvent_ = nil;
  return event.handled();
}

Then this would look like

if (![self handleUnhandledKeyDownAsKeyEvent])
  [[self nextResponder] doCommandBySelector:selector];

and we'd have

- (void)keyDown:(NSEvent*)theEvent {
  keyDownEvent_ = theEvent;
  // Convert the event into an action message, according to OSX key mappings.
  [self interpretKeyEvents:@[ theEvent ]];
  [self handleUnhandledKeyDownAsKeyEvent];
  DCHECK(!keyDownEvent_);
}

[themblsha, 2016/11/18 13:31:50]

Nice, removes quite a bit of duplicate code.

+    ui::KeyEvent event(keyDownEvent_);
+    keyDownEvent_ = nil;
+    [self handleKeyEvent:&event];
+    if (event.handled())
+      return;
+  }
+
+  [[self nextResponder] doCommandBySelector:selector];
 }
 
 - (NSRect)firstRectForCharacterRange:(NSRange)range
                          actualRange:(NSRangePointer)actualNSRange {
   gfx::Range actualRange;
   gfx::Rect rect = GetFirstRectForRangeHelper(textInputClient_,
                                               gfx::Range(range), &actualRange);
   if (actualNSRange)
     *actualNSRange = actualRange.ToNSRange();
   return gfx::ScreenRectToNSRect(rect);
@@ skipping 126 matching lines @@
   return [hostedView_->GetNativeViewAccessible() accessibilityHitTest:point];
 }
 
 - (id)accessibilityFocusedUIElement {
   if (!hostedView_)
     return nil;
   return [hostedView_->GetNativeViewAccessible() accessibilityFocusedUIElement];
 }
 
 @end