Index: ui/views/controls/button/custom_button.cc |
diff --git a/ui/views/controls/button/custom_button.cc b/ui/views/controls/button/custom_button.cc |
index 3ab8303e9f8821d8dd77e1f7ba7308153cd78a60..86fca746d59c3894bddfe1c6250ee2e22d279708 100644 |
--- a/ui/views/controls/button/custom_button.cc |
+++ b/ui/views/controls/button/custom_button.cc |
@@ -263,13 +263,6 @@ void CustomButton::OnGestureEvent(ui::GestureEvent* event) { |
} |
bool CustomButton::AcceleratorPressed(const ui::Accelerator& accelerator) { |
- // Should only handle accelerators when active. However, only top level |
- // widgets can be active, so for child widgets check if they are focused |
- // instead. |
- if ((IsChildWidget() && !FocusInChildWidget()) || |
- (!IsChildWidget() && !GetWidget()->IsActive())) { |
- return false; |
- } |
SetState(STATE_NORMAL); |
// TODO(beng): remove once NotifyClick takes ui::Event. |
ui::MouseEvent synthetic_event( |
@@ -440,14 +433,4 @@ void CustomButton::OnClickCanceled(const ui::Event& event) { |
Button::OnClickCanceled(event); |
} |
-bool CustomButton::IsChildWidget() const { |
- return GetWidget() && GetWidget()->GetTopLevelWidget() != GetWidget(); |
-} |
- |
-bool CustomButton::FocusInChildWidget() const { |
- return GetWidget() && |
- GetWidget()->GetRootView()->Contains( |
- GetFocusManager()->GetFocusedView()); |
-} |
- |
} // namespace views |