Only check the keycode for key events.

Allows the re-enabling of BrowserAccelerators test.


BUG=92563
TEST=*BrowserAccelerators


Review URL: http://codereview.chromium.org/7634028

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96671 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm

@@ -846,7 +846,9 @@ bool OmniboxViewMac::OnDoCommandBySelector(SEL cmd) {
   // behavior with the proper WindowOpenDisposition.
   NSEvent* event = [NSApp currentEvent];
   if (cmd == @selector(insertNewline:) ||
-     (cmd == @selector(noop:) && [event keyCode] == kVK_Return)) {
+     (cmd == @selector(noop:) &&
+      ([event type] == NSKeyDown || [event type] == NSKeyUp) &&
+      [event keyCode] == kVK_Return)) {
     WindowOpenDisposition disposition =
         event_utils::WindowOpenDispositionFromNSEvent(event);
     model_->AcceptInput(disposition, false);

chrome/browser/ui/omnibox/omnibox_view_browsertest.cc

@@ -1122,13 +1122,7 @@ class OmniboxViewTest : public InProcessBrowserTest,
 // See http://crbug.com/19193: omnibox blocks ctrl-* commands
 //
 // Flaky on interactive tests (dbg), http://crbug.com/69433
-// Disabled on OSX interactive ui tests 10.6, http://crbug.com/92563
-#if defined(OS_MACOSX)
-#define MAYBE_BrowserAccelerators DISABLED_BrowserAccelerators
-#else
-#define MAYBE_BrowserAccelerators FLAKY_BrowserAccelerators
-#endif
-IN_PROC_BROWSER_TEST_F(OmniboxViewTest, MAYBE_BrowserAccelerators) {
+IN_PROC_BROWSER_TEST_F(OmniboxViewTest, FLAKY_BrowserAccelerators) {
   BrowserAcceleratorsTest();
 }