MacViews: Fix accelerator handling while Omnibox is in focus.

ui/views/test/event_generator_delegate_mac.mm

Index: ui/views/test/event_generator_delegate_mac.mm
diff --git a/ui/views/test/event_generator_delegate_mac.mm b/ui/views/test/event_generator_delegate_mac.mm
index 55005ea2c4647103ab53c465a2105e3f0cd20934..234e550d600e0e566bd41a04e9b88ba23f0c070f 100644
--- a/ui/views/test/event_generator_delegate_mac.mm
+++ b/ui/views/test/event_generator_delegate_mac.mm
@@ -353,10 +353,18 @@ void EventGeneratorDelegateMac::OnMouseEvent(ui::MouseEvent* event) {
                                                event->type(),
                                                event->location(),
                                                event->changed_button_flags());
-  if (owner_->targeting_application())
+  using Target = ui::test::EventGenerator::Target;
+  switch (owner_->target()) {
+  case Target::APPLICATION:

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

this should be indented - git cl format?

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

Ah, I'm probably using an outdated clang-format in my Sublime Text installation.

     [NSApp sendEvent:ns_event];
-  else
+    break;
+  case Target::WINDOW:
+    [window_ sendEvent:ns_event];
+    break;
+  case Target::WIDGET:
     EmulateSendEvent(window_, ns_event);
+    break;
+  }
 }
 
 void EventGeneratorDelegateMac::OnKeyEvent(ui::KeyEvent* event) {
@@ -364,15 +372,22 @@ void EventGeneratorDelegateMac::OnKeyEvent(ui::KeyEvent* event) {
   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;
-  }
 
-  if ([fake_menu_ performKeyEquivalent: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);
+    EmulateSendEvent(window_, ns_event);
+    break;
+  }
 }
 
 void EventGeneratorDelegateMac::OnTouchEvent(ui::TouchEvent* event) {