diff options
Diffstat (limited to 'chrome/browser/chromeos')
5 files changed, 12 insertions, 12 deletions
diff --git a/chrome/browser/chromeos/input_method/accessibility.cc b/chrome/browser/chromeos/input_method/accessibility.cc index af4c8a4..1f19e4f 100644 --- a/chrome/browser/chromeos/input_method/accessibility.cc +++ b/chrome/browser/chromeos/input_method/accessibility.cc @@ -38,7 +38,7 @@ void Accessibility::InputMethodChanged(InputMethodManager* imm, AccessibilityAlertInfo event(ProfileManager::GetActiveUserProfile(), medium_name); SendControlAccessibilityNotification( - ui::AccessibilityTypes::EVENT_ALERT, &event); + ui::AX_EVENT_ALERT, &event); } } // namespace input_method diff --git a/chrome/browser/chromeos/login/existing_user_controller.cc b/chrome/browser/chromeos/login/existing_user_controller.cc index 2e806e9..6a0393e 100644 --- a/chrome/browser/chromeos/login/existing_user_controller.cc +++ b/chrome/browser/chromeos/login/existing_user_controller.cc @@ -61,7 +61,7 @@ #include "net/http/http_transaction_factory.h" #include "net/url_request/url_request_context.h" #include "net/url_request/url_request_context_getter.h" -#include "ui/base/accessibility/accessibility_types.h" +#include "ui/accessibility/ax_enums.h" #include "ui/base/l10n/l10n_util.h" #include "ui/views/widget/widget.h" @@ -1111,7 +1111,7 @@ void ExistingUserController::SendAccessibilityAlert( const std::string& alert_text) { AccessibilityAlertInfo event(ProfileHelper::GetSigninProfile(), alert_text); SendControlAccessibilityNotification( - ui::AccessibilityTypes::EVENT_VALUE_CHANGED, &event); + ui::AX_EVENT_VALUE_CHANGED, &event); } } // namespace chromeos diff --git a/chrome/browser/chromeos/options/network_config_view.cc b/chrome/browser/chromeos/options/network_config_view.cc index aad98cf..7999cda 100644 --- a/chrome/browser/chromeos/options/network_config_view.cc +++ b/chrome/browser/chromeos/options/network_config_view.cc @@ -26,8 +26,8 @@ #include "grit/generated_resources.h" #include "grit/locale_settings.h" #include "grit/theme_resources.h" +#include "ui/accessibility/ax_view_state.h" #include "ui/aura/window_event_dispatcher.h" -#include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/gfx/image/image.h" @@ -204,10 +204,10 @@ ui::ModalType NetworkConfigView::GetModalType() const { return ui::MODAL_TYPE_SYSTEM; } -void NetworkConfigView::GetAccessibleState(ui::AccessibleViewState* state) { +void NetworkConfigView::GetAccessibleState(ui::AXViewState* state) { state->name = l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_OTHER_WIFI_NETWORKS); - state->role = ui::AccessibilityTypes::ROLE_DIALOG; + state->role = ui::AX_ROLE_DIALOG; } void NetworkConfigView::ButtonPressed(views::Button* sender, diff --git a/chrome/browser/chromeos/options/network_config_view.h b/chrome/browser/chromeos/options/network_config_view.h index f7ab076..a6c4c22 100644 --- a/chrome/browser/chromeos/options/network_config_view.h +++ b/chrome/browser/chromeos/options/network_config_view.h @@ -67,7 +67,7 @@ class NetworkConfigView : public views::DialogDelegateView, virtual ui::ModalType GetModalType() const OVERRIDE; // views::View overrides. - virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; + virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE; // views::ButtonListener overrides. virtual void ButtonPressed( diff --git a/chrome/browser/chromeos/ui/idle_app_name_notification_view.cc b/chrome/browser/chromeos/ui/idle_app_name_notification_view.cc index 194395b..4052d5e 100644 --- a/chrome/browser/chromeos/ui/idle_app_name_notification_view.cc +++ b/chrome/browser/chromeos/ui/idle_app_name_notification_view.cc @@ -16,8 +16,8 @@ #include "base/timer/timer.h" #include "extensions/common/extension.h" #include "grit/generated_resources.h" +#include "ui/accessibility/ax_view_state.h" #include "ui/aura/window.h" -#include "ui/base/accessibility/accessible_view_state.h" #include "ui/base/l10n/l10n_util.h" #include "ui/base/resource/resource_bundle.h" #include "ui/compositor/layer_animation_observer.h" @@ -100,7 +100,7 @@ void CreateAndShowWidgetWithContent(views::WidgetDelegate* delegate, widget->SetBounds(bounds); // Allow to use the message for spoken feedback. - view->NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true); + view->NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true); } } // namespace @@ -202,9 +202,9 @@ class IdleAppNameNotificationDelegateView views::WidgetDelegateView::OnPaint(canvas); } - virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE { + virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE { state->name = spoken_text_; - state->role = ui::AccessibilityTypes::ROLE_ALERT; + state->role = ui::AX_ROLE_ALERT; } // ImplicitAnimationObserver overrides @@ -268,7 +268,7 @@ bool IdleAppNameNotificationView::IsVisible() { } base::string16 IdleAppNameNotificationView::GetShownTextForTest() { - ui::AccessibleViewState state; + ui::AXViewState state; DCHECK(view_); view_->GetAccessibleState(&state); return state.name; |