Index: ui/views/controls/button/button.cc |
diff --git a/ui/views/controls/button/button.cc b/ui/views/controls/button/button.cc |
index 92603dd145955a3113d250a27b1e6f66612b83cb..667afbeff394158de137f1ae1d3dec550f7f4b00 100644 |
--- a/ui/views/controls/button/button.cc |
+++ b/ui/views/controls/button/button.cc |
@@ -24,6 +24,16 @@ Button::ButtonState Button::GetButtonStateFrom(ui::NativeTheme::State state) { |
return Button::STATE_NORMAL; |
} |
+// static |
+void Button::ConfigureDefaultFocus(Button* button) { |
+// On Mac, buttons are focusable only in full keyboard access mode. |
+#if defined(OS_MACOSX) |
+ button->SetFocusBehavior(FocusBehavior::ACCESSIBLE_ONLY); |
+#else |
+ button->SetFocusBehavior(FocusBehavior::ALWAYS); |
+#endif |
+} |
+ |
//////////////////////////////////////////////////////////////////////////////// |
// Button, public: |
@@ -64,7 +74,7 @@ void Button::GetAccessibleState(ui::AXViewState* state) { |
Button::Button(ButtonListener* listener) |
: listener_(listener), |
tag_(-1) { |
- SetAccessibilityFocusable(true); |
+ SetFocusBehavior(views::View::FocusBehavior::ACCESSIBLE_ONLY); |
} |
void Button::NotifyClick(const ui::Event& event) { |