MacViews: Fix accelerator handling while Omnibox is in focus.

ui/views/test/event_generator_delegate_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.
 
 #import <Cocoa/Cocoa.h>
 #include <stddef.h>
 
 #import "base/mac/scoped_nsobject.h"
 #import "base/mac/scoped_objc_class_swizzler.h"
 #include "base/macros.h"
@@ skipping 357 matching lines @@
   return nullptr;
 }
 
 void EventGeneratorDelegateMac::OnMouseEvent(ui::MouseEvent* event) {
   NSEvent* ns_event =
       event->type() == ui::ET_MOUSEWHEEL
           ? CreateMouseWheelEventInWindow(window_, event)
           : CreateMouseEventInWindow(window_, event->type(), event->location(),
                                      event->changed_button_flags());
 
-  if (owner_->targeting_application())
-    [NSApp sendEvent:ns_event];
-  else
-    EmulateSendEvent(window_, ns_event);
+  using Target = ui::test::EventGenerator::Target;
+  switch (owner_->target()) {
+    case Target::APPLICATION:
+      [NSApp sendEvent:ns_event];
+      break;
+    case Target::WINDOW:
+      [window_ sendEvent:ns_event];
+      break;
+    case Target::WIDGET:
+      EmulateSendEvent(window_, ns_event);
+      break;
+  }
 }
 
 void EventGeneratorDelegateMac::OnKeyEvent(ui::KeyEvent* event) {
   NSUInteger modifiers = EventFlagsToModifiers(event->flags());
   NSEvent* ns_event = cocoa_test_event_utils::SynthesizeKeyEvent(
       window_, event->type() == ui::ET_KEY_PRESSED, event->key_code(),
       modifiers, event->is_char() ? event->GetDomKey() : ui::DomKey::NONE);
-  if (owner_->targeting_application()) {
-    [NSApp sendEvent:ns_event];
-    return;
+
+  using Target = ui::test::EventGenerator::Target;
+  switch (owner_->target()) {
+    case Target::APPLICATION:
+      [NSApp sendEvent:ns_event];
+      break;
+    case Target::WINDOW:
+      [window_ sendEvent:ns_event];
+      break;
+    case Target::WIDGET:
+      if ([fake_menu_ performKeyEquivalent:ns_event])
+        return;
+
+      EmulateSendEvent(window_, ns_event);
+      break;
   }
-
-  if ([fake_menu_ performKeyEquivalent:ns_event])
-    return;
-
-  EmulateSendEvent(window_, ns_event);
 }
 
 void EventGeneratorDelegateMac::OnTouchEvent(ui::TouchEvent* event) {
   NOTREACHED() << "Touchscreen events not supported on Chrome Mac.";
 }
 
 void EventGeneratorDelegateMac::OnScrollEvent(ui::ScrollEvent* event) {
   // Ignore FLING_CANCEL. Cocoa provides a continuous stream of events during a
   // fling. For now, this method simulates a momentum stream using a single
   // update with a momentum phase (plus begin/end phase events), triggered when
@@ skipping 186 matching lines @@
 - (NSEvent*)currentEvent {
   if (g_current_event)
     return g_current_event;
 
   // Find the original implementation and invoke it.
   IMP original = EventGeneratorDelegateMac::GetInstance()->CurrentEventMethod();
   return original(self, _cmd);
 }
 
 @end