diff options
Diffstat (limited to 'chrome/browser/accessibility')
4 files changed, 26 insertions, 26 deletions
diff --git a/chrome/browser/accessibility/accessibility_events.cc b/chrome/browser/accessibility/accessibility_events.cc index 320b6f5..005f71d 100644 --- a/chrome/browser/accessibility/accessibility_events.cc +++ b/chrome/browser/accessibility/accessibility_events.cc @@ -16,7 +16,7 @@ namespace keys = extension_accessibility_api_constants; void SendControlAccessibilityNotification( - ui::AccessibilityTypes::Event event, + ui::AXEvent event, AccessibilityControlInfo* info) { Profile *profile = info->profile(); if (profile->ShouldSendAccessibilityEvents()) { @@ -27,7 +27,7 @@ void SendControlAccessibilityNotification( } void SendMenuAccessibilityNotification( - ui::AccessibilityTypes::Event event, + ui::AXEvent event, AccessibilityMenuInfo* info) { Profile *profile = info->profile(); if (profile->ShouldSendAccessibilityEvents()) { @@ -38,7 +38,7 @@ void SendMenuAccessibilityNotification( } void SendWindowAccessibilityNotification( - ui::AccessibilityTypes::Event event, + ui::AXEvent event, AccessibilityWindowInfo* info) { Profile *profile = info->profile(); if (profile->ShouldSendAccessibilityEvents()) { diff --git a/chrome/browser/accessibility/accessibility_events.h b/chrome/browser/accessibility/accessibility_events.h index 5ba386c2..84ee2b0 100644 --- a/chrome/browser/accessibility/accessibility_events.h +++ b/chrome/browser/accessibility/accessibility_events.h @@ -7,7 +7,7 @@ #include <string> #include "base/compiler_specific.h" -#include "ui/base/accessibility/accessibility_types.h" +#include "ui/accessibility/ax_enums.h" class AccessibilityControlInfo; class AccessibilityMenuInfo; @@ -22,15 +22,15 @@ class DictionaryValue; // event and AccessibilityEventInfo details. Will not send if the profile's // pause level is nonzero (using profile->PauseAccessibilityEvents). void SendControlAccessibilityNotification( - ui::AccessibilityTypes::Event event, + ui::AXEvent event, AccessibilityControlInfo* info); void SendMenuAccessibilityNotification( - ui::AccessibilityTypes::Event event, + ui::AXEvent event, AccessibilityMenuInfo* info); void SendWindowAccessibilityNotification( - ui::AccessibilityTypes::Event event, + ui::AXEvent event, AccessibilityWindowInfo* info); // Abstract parent class for accessibility event information passed to event diff --git a/chrome/browser/accessibility/accessibility_extension_api.cc b/chrome/browser/accessibility/accessibility_extension_api.cc index 4f5be51..7cd5241 100644 --- a/chrome/browser/accessibility/accessibility_extension_api.cc +++ b/chrome/browser/accessibility/accessibility_extension_api.cc @@ -73,28 +73,28 @@ void ExtensionAccessibilityEventRouter::ClearControlEventCallback() { } void ExtensionAccessibilityEventRouter::HandleWindowEvent( - ui::AccessibilityTypes::Event event, + ui::AXEvent event, const AccessibilityWindowInfo* info) { if (!control_event_callback_.is_null()) control_event_callback_.Run(event, info); - if (event == ui::AccessibilityTypes::EVENT_ALERT) + if (event == ui::AX_EVENT_ALERT) OnWindowOpened(info); } void ExtensionAccessibilityEventRouter::HandleMenuEvent( - ui::AccessibilityTypes::Event event, + ui::AXEvent event, const AccessibilityMenuInfo* info) { switch (event) { - case ui::AccessibilityTypes::EVENT_MENUSTART: - case ui::AccessibilityTypes::EVENT_MENUPOPUPSTART: + case ui::AX_EVENT_MENU_START: + case ui::AX_EVENT_MENU_POPUP_START: OnMenuOpened(info); break; - case ui::AccessibilityTypes::EVENT_MENUEND: - case ui::AccessibilityTypes::EVENT_MENUPOPUPEND: + case ui::AX_EVENT_MENU_END: + case ui::AX_EVENT_MENU_POPUP_END: OnMenuClosed(info); break; - case ui::AccessibilityTypes::EVENT_FOCUS: + case ui::AX_EVENT_FOCUS: OnControlFocused(info); break; default: @@ -103,21 +103,21 @@ void ExtensionAccessibilityEventRouter::HandleMenuEvent( } void ExtensionAccessibilityEventRouter::HandleControlEvent( - ui::AccessibilityTypes::Event event, + ui::AXEvent event, const AccessibilityControlInfo* info) { if (!control_event_callback_.is_null()) control_event_callback_.Run(event, info); switch (event) { - case ui::AccessibilityTypes::EVENT_TEXT_CHANGED: - case ui::AccessibilityTypes::EVENT_SELECTION_CHANGED: + case ui::AX_EVENT_TEXT_CHANGED: + case ui::AX_EVENT_SELECTION_CHANGED: OnTextChanged(info); break; - case ui::AccessibilityTypes::EVENT_VALUE_CHANGED: - case ui::AccessibilityTypes::EVENT_ALERT: + case ui::AX_EVENT_VALUE_CHANGED: + case ui::AX_EVENT_ALERT: OnControlAction(info); break; - case ui::AccessibilityTypes::EVENT_FOCUS: + case ui::AX_EVENT_FOCUS: OnControlFocused(info); break; default: diff --git a/chrome/browser/accessibility/accessibility_extension_api.h b/chrome/browser/accessibility/accessibility_extension_api.h index 11fda2c..c053cd2 100644 --- a/chrome/browser/accessibility/accessibility_extension_api.h +++ b/chrome/browser/accessibility/accessibility_extension_api.h @@ -12,7 +12,7 @@ #include "base/values.h" #include "chrome/browser/accessibility/accessibility_events.h" #include "chrome/browser/extensions/chrome_extension_function.h" -#include "ui/base/accessibility/accessibility_types.h" +#include "ui/accessibility/ax_enums.h" namespace extensions { class ExtensionHost; @@ -22,7 +22,7 @@ class ExtensionHost; // to the extension system. class ExtensionAccessibilityEventRouter { public: - typedef base::Callback<void(ui::AccessibilityTypes::Event, + typedef base::Callback<void(ui::AXEvent, const AccessibilityControlInfo*)> ControlEventCallback; // Single instance of the event router. @@ -47,15 +47,15 @@ class ExtensionAccessibilityEventRouter { void ClearControlEventCallback(); // Route a window-related accessibility event. - void HandleWindowEvent(ui::AccessibilityTypes::Event event, + void HandleWindowEvent(ui::AXEvent event, const AccessibilityWindowInfo* info); // Route a menu-related accessibility event. - void HandleMenuEvent(ui::AccessibilityTypes::Event event, + void HandleMenuEvent(ui::AXEvent event, const AccessibilityMenuInfo* info); // Route a control-related accessibility event. - void HandleControlEvent(ui::AccessibilityTypes::Event event, + void HandleControlEvent(ui::AXEvent event, const AccessibilityControlInfo* info); void OnChromeVoxLoadStateChanged( |