diff options
Diffstat (limited to 'chromium/ui/views/controls/button/custom_button.cc')
| -rw-r--r-- | chromium/ui/views/controls/button/custom_button.cc | 15 |
1 files changed, 9 insertions, 6 deletions
diff --git a/chromium/ui/views/controls/button/custom_button.cc b/chromium/ui/views/controls/button/custom_button.cc index 2be2a2301e1..0e237a31273 100644 --- a/chromium/ui/views/controls/button/custom_button.cc +++ b/chromium/ui/views/controls/button/custom_button.cc @@ -4,7 +4,7 @@ #include "ui/views/controls/button/custom_button.h" -#include "ui/base/accessibility/accessible_view_state.h" +#include "ui/accessibility/ax_view_state.h" #include "ui/events/event.h" #include "ui/events/keycodes/keyboard_codes.h" #include "ui/gfx/animation/throb_animation.h" @@ -101,7 +101,7 @@ void CustomButton::SetHotTracked(bool is_hot_tracked) { SetState(is_hot_tracked ? STATE_HOVERED : STATE_NORMAL); if (is_hot_tracked) - NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_FOCUS, true); + NotifyAccessibilityEvent(ui::AX_EVENT_FOCUS, true); } bool CustomButton::IsHotTracked() const { @@ -199,6 +199,7 @@ bool CustomButton::OnKeyPressed(const ui::KeyEvent& event) { ui::MouseEvent synthetic_event(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), + ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON); NotifyClick(synthetic_event); } else { @@ -216,6 +217,7 @@ bool CustomButton::OnKeyReleased(const ui::KeyEvent& event) { ui::MouseEvent synthetic_event(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), + ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON); NotifyClick(synthetic_event); return true; @@ -260,6 +262,7 @@ bool CustomButton::AcceleratorPressed(const ui::Accelerator& accelerator) { ui::MouseEvent synthetic_event(ui::ET_MOUSE_RELEASED, gfx::Point(), gfx::Point(), + ui::EF_LEFT_MOUSE_BUTTON, ui::EF_LEFT_MOUSE_BUTTON); NotifyClick(synthetic_event); return true; @@ -281,17 +284,17 @@ void CustomButton::OnDragDone() { SetState(STATE_NORMAL); } -void CustomButton::GetAccessibleState(ui::AccessibleViewState* state) { +void CustomButton::GetAccessibleState(ui::AXViewState* state) { Button::GetAccessibleState(state); switch (state_) { case STATE_HOVERED: - state->state = ui::AccessibilityTypes::STATE_HOTTRACKED; + state->AddStateFlag(ui::AX_STATE_HOVERED); break; case STATE_PRESSED: - state->state = ui::AccessibilityTypes::STATE_PRESSED; + state->AddStateFlag(ui::AX_STATE_PRESSED); break; case STATE_DISABLED: - state->state = ui::AccessibilityTypes::STATE_UNAVAILABLE; + state->AddStateFlag(ui::AX_STATE_DISABLED); break; case STATE_NORMAL: case STATE_COUNT: |