MacViews: Handle Space and Return keys correctly for Buttons.

ui/views/window/dialog_delegate_unittest.cc

 // Copyright 2013 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.
 
 #include <stddef.h>
 
 #include "base/macros.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/base/hit_test.h"
 #include "ui/events/event_processor.h"
@@ skipping 138 matching lines @@
   EXPECT_EQ(dialog()->input(), dialog()->GetFocusManager()->GetFocusedView());
   const ui::KeyEvent return_event(
       ui::ET_KEY_PRESSED, ui::VKEY_RETURN, ui::EF_NONE);
   SimulateKeyEvent(return_event);
   dialog()->CheckAndResetStates(false, true, false);
   const ui::KeyEvent escape_event(
       ui::ET_KEY_PRESSED, ui::VKEY_ESCAPE, ui::EF_NONE);
   SimulateKeyEvent(escape_event);
   dialog()->CheckAndResetStates(false, false, true);
 
-  // Check ok and cancel button behavior on a directed return key events.
-  ok_button->OnKeyPressed(return_event);
+// Check ok and cancel button behavior on a directed return key event. Buttons
+// won't respond to a return key event on Mac, since it performs the default
+// action.
+#if defined(OS_MACOSX)
+  EXPECT_FALSE(ok_button->OnKeyPressed(return_event));
+  dialog()->CheckAndResetStates(false, false, false);
+  EXPECT_FALSE(cancel_button->OnKeyPressed(return_event));
+  dialog()->CheckAndResetStates(false, false, false);
+#else
+  EXPECT_TRUE(ok_button->OnKeyPressed(return_event));
   dialog()->CheckAndResetStates(false, true, false);
-  cancel_button->OnKeyPressed(return_event);
+  EXPECT_TRUE(cancel_button->OnKeyPressed(return_event));
   dialog()->CheckAndResetStates(true, false, false);
+#endif
 
-  // Check that return accelerators cancel dialogs if cancel is focused.
+  // Check that return accelerators cancel dialogs if cancel is focused, except
+  // on Mac where return should perform the default action.
   cancel_button->RequestFocus();
   EXPECT_EQ(cancel_button, dialog()->GetFocusManager()->GetFocusedView());
   SimulateKeyEvent(return_event);
+#if defined(OS_MACOSX)
+  dialog()->CheckAndResetStates(false, true, false);
+#else
   dialog()->CheckAndResetStates(true, false, false);
+#endif
 
   // Check that escape can be overridden.
   dialog()->set_should_handle_escape(true);
   SimulateKeyEvent(escape_event);
   dialog()->CheckAndResetStates(false, false, false);
 }
 
 TEST_F(DialogTest, RemoveDefaultButton) {
   // Removing buttons from the dialog here should not cause a crash on close.
   delete dialog()->GetDialogClientView()->ok_button();
@@ skipping 73 matching lines @@
   dialog2->TearDown();
 }
 
 // Tests default focus is assigned correctly when showing a new dialog.
 TEST_F(DialogTest, InitialFocus) {
   EXPECT_TRUE(dialog()->input()->HasFocus());
   EXPECT_EQ(dialog()->input(), dialog()->GetFocusManager()->GetFocusedView());
 }
 
 }  // namespace views