Move ui/base/accessibility to ui/accessibility.

Gets rid of the enums defined in accessibility_types.h and switches to the
enums defined in ui/accessibility/ax_enums.h, which are shared by "content".

Eventually, content and views may share more common accessibility code, but
moving to the same enums is a good first step.

BUG=316726
R=piman@chromium.org, sky@chromium.org, tfarina@chromium.org

Review URL: https://codereview.chromium.org/126763003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@253207 0039d316-1c4b-4281-b951-d872f2087c98

77 files changed, 274 insertions, 273 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(
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;
diff --git a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
index 64e0cbd..dd8e5c2 100644
--- a/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
+++ b/chrome/browser/ui/ash/chrome_shell_delegate_chromeos.cc
@@ -174,7 +174,7 @@ class AccessibilityDelegateImpl : public ash::AccessibilityDelegate {
           AccessibilityAlertInfo event(
               profile, l10n_util::GetStringUTF8(IDS_A11Y_ALERT_WINDOW_NEEDED));
           SendControlAccessibilityNotification(
-              ui::AccessibilityTypes::EVENT_ALERT, &event);
+              ui::AX_EVENT_ALERT, &event);
           break;
         }
         case ash::A11Y_ALERT_NONE:
diff --git a/chrome/browser/ui/gtk/location_bar_view_gtk.cc b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
index 71d80fd9..c5c0134 100644
--- a/chrome/browser/ui/gtk/location_bar_view_gtk.cc
+++ b/chrome/browser/ui/gtk/location_bar_view_gtk.cc
@@ -81,8 +81,8 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "net/base/net_util.h"
+#include "ui/accessibility/ax_enums.h"
 #include "ui/base/accelerators/platform_accelerator_gtk.h"
-#include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/dragdrop/gtk_dnd_util.h"
 #include "ui/base/gtk/gtk_hig_constants.h"
 #include "ui/base/gtk/gtk_signal_registrar.h"
@@ -628,7 +628,7 @@ void LocationBarViewGtk::OnSetFocus() {
                                 l10n_util::GetStringUTF8(IDS_ACCNAME_LOCATION),
                                 std::string(), false);
   ExtensionAccessibilityEventRouter::GetInstance()->HandleControlEvent(
-      ui::AccessibilityTypes::EVENT_FOCUS, &info);
+      ui::AX_EVENT_FOCUS, &info);
 
   // Update the keyword and search hint states.
   OnChanged();
diff --git a/chrome/browser/ui/views/accessibility/accessibility_event_router_views.cc b/chrome/browser/ui/views/accessibility/accessibility_event_router_views.cc
index b946bcf..f3bd9c9 100644
--- a/chrome/browser/ui/views/accessibility/accessibility_event_router_views.cc
+++ b/chrome/browser/ui/views/accessibility/accessibility_event_router_views.cc
@@ -15,7 +15,7 @@
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "content/public/browser/notification_service.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/views/controls/menu/menu_item_view.h"
 #include "ui/views/controls/menu/submenu_view.h"
 #include "ui/views/controls/tree/tree_view.h"
@@ -42,14 +42,14 @@ AccessibilityEventRouterViews* AccessibilityEventRouterViews::GetInstance() {
 }
 
 void AccessibilityEventRouterViews::HandleAccessibilityEvent(
-    views::View* view, ui::AccessibilityTypes::Event event_type) {
+    views::View* view, ui::AXEvent event_type) {
   if (!ExtensionAccessibilityEventRouter::GetInstance()->
       IsAccessibilityEnabled()) {
     return;
   }
 
-  if (event_type == ui::AccessibilityTypes::EVENT_TEXT_CHANGED ||
-      event_type == ui::AccessibilityTypes::EVENT_SELECTION_CHANGED) {
+  if (event_type == ui::AX_EVENT_TEXT_CHANGED ||
+      event_type == ui::AX_EVENT_SELECTION_CHANGED) {
     // These two events should only be sent for views that have focus. This
     // enforces the invariant that we fire events triggered by user action and
     // not by programmatic logic. For example, the location bar can be updated
@@ -100,7 +100,7 @@ void AccessibilityEventRouterViews::HandleMenuItemFocused(
                                  item_index,
                                  item_count);
   SendControlAccessibilityNotification(
-      ui::AccessibilityTypes::EVENT_FOCUS, &info);
+      ui::AX_EVENT_FOCUS, &info);
 }
 
 void AccessibilityEventRouterViews::Observe(
@@ -119,7 +119,7 @@ void AccessibilityEventRouterViews::Observe(
 
 void AccessibilityEventRouterViews::DispatchEventOnViewStorageId(
     int view_storage_id,
-    ui::AccessibilityTypes::Event type) {
+    ui::AXEvent type) {
   views::ViewStorage* view_storage = views::ViewStorage::GetInstance();
   views::View* view = view_storage->RetrieveView(view_storage_id);
   view_storage->RemoveView(view_storage_id);
@@ -132,7 +132,7 @@ void AccessibilityEventRouterViews::DispatchEventOnViewStorageId(
 }
 
 void AccessibilityEventRouterViews::DispatchAccessibilityEvent(
-    views::View* view, ui::AccessibilityTypes::Event type) {
+    views::View* view, ui::AXEvent type) {
   // Get the profile associated with this view. If it's not found, use
   // the most recent profile where accessibility events were sent, or
   // the default profile.
@@ -155,64 +155,64 @@ void AccessibilityEventRouterViews::DispatchAccessibilityEvent(
 
   most_recent_profile_ = profile;
 
-  if (type == ui::AccessibilityTypes::EVENT_MENUSTART ||
-      type == ui::AccessibilityTypes::EVENT_MENUPOPUPSTART ||
-      type == ui::AccessibilityTypes::EVENT_MENUEND ||
-      type == ui::AccessibilityTypes::EVENT_MENUPOPUPEND) {
+  if (type == ui::AX_EVENT_MENU_START ||
+      type == ui::AX_EVENT_MENU_POPUP_START ||
+      type == ui::AX_EVENT_MENU_END ||
+      type == ui::AX_EVENT_MENU_POPUP_END) {
     SendMenuNotification(view, type, profile);
     return;
   }
 
-  ui::AccessibleViewState state;
+  ui::AXViewState state;
   view->GetAccessibleState(&state);
 
-  if (type == ui::AccessibilityTypes::EVENT_ALERT &&
-      !(state.role == ui::AccessibilityTypes::ROLE_ALERT ||
-        state.role == ui::AccessibilityTypes::ROLE_WINDOW)) {
+  if (type == ui::AX_EVENT_ALERT &&
+      !(state.role == ui::AX_ROLE_ALERT ||
+        state.role == ui::AX_ROLE_WINDOW)) {
     SendAlertControlNotification(view, type, profile);
     return;
   }
 
   switch (state.role) {
-  case ui::AccessibilityTypes::ROLE_ALERT:
-  case ui::AccessibilityTypes::ROLE_DIALOG:
-  case ui::AccessibilityTypes::ROLE_WINDOW:
+  case ui::AX_ROLE_ALERT:
+  case ui::AX_ROLE_DIALOG:
+  case ui::AX_ROLE_WINDOW:
     SendWindowNotification(view, type, profile);
     break;
-  case ui::AccessibilityTypes::ROLE_BUTTONMENU:
-  case ui::AccessibilityTypes::ROLE_MENUBAR:
-  case ui::AccessibilityTypes::ROLE_MENUPOPUP:
+  case ui::AX_ROLE_POP_UP_BUTTON:
+  case ui::AX_ROLE_MENU_BAR:
+  case ui::AX_ROLE_MENU_LIST_POPUP:
     SendMenuNotification(view, type, profile);
     break;
-  case ui::AccessibilityTypes::ROLE_BUTTONDROPDOWN:
-  case ui::AccessibilityTypes::ROLE_PUSHBUTTON:
+  case ui::AX_ROLE_BUTTON_DROP_DOWN:
+  case ui::AX_ROLE_BUTTON:
     SendButtonNotification(view, type, profile);
     break;
-  case ui::AccessibilityTypes::ROLE_CHECKBUTTON:
+  case ui::AX_ROLE_CHECK_BOX:
     SendCheckboxNotification(view, type, profile);
     break;
-  case ui::AccessibilityTypes::ROLE_COMBOBOX:
+  case ui::AX_ROLE_COMBO_BOX:
     SendComboboxNotification(view, type, profile);
     break;
-  case ui::AccessibilityTypes::ROLE_LINK:
+  case ui::AX_ROLE_LINK:
     SendLinkNotification(view, type, profile);
     break;
-  case ui::AccessibilityTypes::ROLE_LOCATION_BAR:
-  case ui::AccessibilityTypes::ROLE_TEXT:
+  case ui::AX_ROLE_LOCATION_BAR:
+  case ui::AX_ROLE_TEXT_FIELD:
     SendTextfieldNotification(view, type, profile);
     break;
-  case ui::AccessibilityTypes::ROLE_MENUITEM:
+  case ui::AX_ROLE_MENU_ITEM:
     SendMenuItemNotification(view, type, profile);
     break;
-  case ui::AccessibilityTypes::ROLE_RADIOBUTTON:
+  case ui::AX_ROLE_RADIO_BUTTON:
     // Not used anymore?
-  case ui::AccessibilityTypes::ROLE_SLIDER:
+  case ui::AX_ROLE_SLIDER:
     SendSliderNotification(view, type, profile);
     break;
-  case ui::AccessibilityTypes::ROLE_OUTLINE:
+  case ui::AX_ROLE_TREE:
     SendTreeNotification(view, type, profile);
     break;
-  case ui::AccessibilityTypes::ROLE_OUTLINEITEM:
+  case ui::AX_ROLE_TREE_ITEM:
     SendTreeItemNotification(view, type, profile);
     break;
   default:
@@ -225,7 +225,7 @@ void AccessibilityEventRouterViews::DispatchAccessibilityEvent(
 // static
 void AccessibilityEventRouterViews::SendButtonNotification(
     views::View* view,
-    ui::AccessibilityTypes::Event event,
+    ui::AXEvent event,
     Profile* profile) {
   AccessibilityButtonInfo info(
       profile, GetViewName(view), GetViewContext(view));
@@ -235,7 +235,7 @@ void AccessibilityEventRouterViews::SendButtonNotification(
 // static
 void AccessibilityEventRouterViews::SendLinkNotification(
     views::View* view,
-    ui::AccessibilityTypes::Event event,
+    ui::AXEvent event,
     Profile* profile) {
   AccessibilityLinkInfo info(profile, GetViewName(view), GetViewContext(view));
   SendControlAccessibilityNotification(event, &info);
@@ -244,7 +244,7 @@ void AccessibilityEventRouterViews::SendLinkNotification(
 // static
 void AccessibilityEventRouterViews::SendMenuNotification(
     views::View* view,
-    ui::AccessibilityTypes::Event event,
+    ui::AXEvent event,
     Profile* profile) {
   AccessibilityMenuInfo info(profile, GetViewName(view));
   SendMenuAccessibilityNotification(event, &info);
@@ -253,7 +253,7 @@ void AccessibilityEventRouterViews::SendMenuNotification(
 // static
 void AccessibilityEventRouterViews::SendMenuItemNotification(
     views::View* view,
-    ui::AccessibilityTypes::Event event,
+    ui::AXEvent event,
     Profile* profile) {
   std::string name = GetViewName(view);
   std::string context = GetViewContext(view);
@@ -283,7 +283,7 @@ void AccessibilityEventRouterViews::SendMenuItemNotification(
 // static
 void AccessibilityEventRouterViews::SendTreeNotification(
     views::View* view,
-    ui::AccessibilityTypes::Event event,
+    ui::AXEvent event,
     Profile* profile) {
   AccessibilityTreeInfo info(profile, GetViewName(view));
   SendControlAccessibilityNotification(event, &info);
@@ -292,7 +292,7 @@ void AccessibilityEventRouterViews::SendTreeNotification(
 // static
 void AccessibilityEventRouterViews::SendTreeItemNotification(
     views::View* view,
-    ui::AccessibilityTypes::Event event,
+    ui::AXEvent event,
     Profile* profile) {
   std::string name = GetViewName(view);
   std::string context = GetViewContext(view);
@@ -337,14 +337,14 @@ void AccessibilityEventRouterViews::SendTreeItemNotification(
 // static
 void AccessibilityEventRouterViews::SendTextfieldNotification(
     views::View* view,
-    ui::AccessibilityTypes::Event event,
+    ui::AXEvent event,
     Profile* profile) {
-  ui::AccessibleViewState state;
+  ui::AXViewState state;
   view->GetAccessibleState(&state);
   std::string name = base::UTF16ToUTF8(state.name);
   std::string context = GetViewContext(view);
   bool password =
-      (state.state & ui::AccessibilityTypes::STATE_PROTECTED) != 0;
+      (state.state & ui::AX_STATE_PROTECTED) != 0;
   AccessibilityTextBoxInfo info(profile, name, context, password);
   std::string value = base::UTF16ToUTF8(state.value);
   info.SetValue(value, state.selection_start, state.selection_end);
@@ -354,9 +354,9 @@ void AccessibilityEventRouterViews::SendTextfieldNotification(
 // static
 void AccessibilityEventRouterViews::SendComboboxNotification(
     views::View* view,
-    ui::AccessibilityTypes::Event event,
+    ui::AXEvent event,
     Profile* profile) {
-  ui::AccessibleViewState state;
+  ui::AXViewState state;
   view->GetAccessibleState(&state);
   std::string name = base::UTF16ToUTF8(state.name);
   std::string value = base::UTF16ToUTF8(state.value);
@@ -369,9 +369,9 @@ void AccessibilityEventRouterViews::SendComboboxNotification(
 // static
 void AccessibilityEventRouterViews::SendCheckboxNotification(
     views::View* view,
-    ui::AccessibilityTypes::Event event,
+    ui::AXEvent event,
     Profile* profile) {
-  ui::AccessibleViewState state;
+  ui::AXViewState state;
   view->GetAccessibleState(&state);
   std::string name = base::UTF16ToUTF8(state.name);
   std::string context = GetViewContext(view);
@@ -379,22 +379,22 @@ void AccessibilityEventRouterViews::SendCheckboxNotification(
       profile,
       name,
       context,
-      state.state == ui::AccessibilityTypes::STATE_CHECKED);
+      state.state == ui::AX_STATE_CHECKED);
   SendControlAccessibilityNotification(event, &info);
 }
 
 // static
 void AccessibilityEventRouterViews::SendWindowNotification(
     views::View* view,
-    ui::AccessibilityTypes::Event event,
+    ui::AXEvent event,
     Profile* profile) {
-  ui::AccessibleViewState state;
+  ui::AXViewState state;
   view->GetAccessibleState(&state);
   std::string window_text;
 
   // If it's an alert, try to get the text from the contents of the
   // static text, not the window title.
-  if (state.role == ui::AccessibilityTypes::ROLE_ALERT)
+  if (state.role == ui::AX_ROLE_ALERT)
     window_text = RecursiveGetStaticText(view);
 
   // Otherwise get it from the window's accessible name.
@@ -408,9 +408,9 @@ void AccessibilityEventRouterViews::SendWindowNotification(
 // static
 void AccessibilityEventRouterViews::SendSliderNotification(
     views::View* view,
-    ui::AccessibilityTypes::Event event,
+    ui::AXEvent event,
     Profile* profile) {
-  ui::AccessibleViewState state;
+  ui::AXViewState state;
   view->GetAccessibleState(&state);
 
   std::string name = base::UTF16ToUTF8(state.name);
@@ -427,9 +427,9 @@ void AccessibilityEventRouterViews::SendSliderNotification(
 // static
 void AccessibilityEventRouterViews::SendAlertControlNotification(
     views::View* view,
-    ui::AccessibilityTypes::Event event,
+    ui::AXEvent event,
     Profile* profile) {
-  ui::AccessibleViewState state;
+  ui::AXViewState state;
   view->GetAccessibleState(&state);
 
   std::string name = base::UTF16ToUTF8(state.name);
@@ -441,7 +441,7 @@ void AccessibilityEventRouterViews::SendAlertControlNotification(
 
 // static
 std::string AccessibilityEventRouterViews::GetViewName(views::View* view) {
-  ui::AccessibleViewState state;
+  ui::AXViewState state;
   view->GetAccessibleState(&state);
   return base::UTF16ToUTF8(state.name);
 }
@@ -451,7 +451,7 @@ std::string AccessibilityEventRouterViews::GetViewContext(views::View* view) {
   for (views::View* parent = view->parent();
        parent;
        parent = parent->parent()) {
-    ui::AccessibleViewState state;
+    ui::AXViewState state;
     parent->GetAccessibleState(&state);
 
     // Two cases are handled right now. More could be added in the future
@@ -459,9 +459,9 @@ std::string AccessibilityEventRouterViews::GetViewContext(views::View* view) {
 
     // A control inside of alert, toolbar or dialog should use that container's
     // accessible name.
-    if ((state.role == ui::AccessibilityTypes::ROLE_ALERT ||
-         state.role == ui::AccessibilityTypes::ROLE_DIALOG ||
-         state.role == ui::AccessibilityTypes::ROLE_TOOLBAR) &&
+    if ((state.role == ui::AX_ROLE_ALERT ||
+         state.role == ui::AX_ROLE_DIALOG ||
+         state.role == ui::AX_ROLE_TOOLBAR) &&
         !state.name.empty()) {
       return base::UTF16ToUTF8(state.name);
     }
@@ -469,12 +469,12 @@ std::string AccessibilityEventRouterViews::GetViewContext(views::View* view) {
     // A control inside of an alert or dialog (including an infobar)
     // should grab the first static text descendant as the context;
     // that's the prompt.
-    if (state.role == ui::AccessibilityTypes::ROLE_ALERT ||
-        state.role == ui::AccessibilityTypes::ROLE_DIALOG) {
+    if (state.role == ui::AX_ROLE_ALERT ||
+        state.role == ui::AX_ROLE_DIALOG) {
       views::View* static_text_child = FindDescendantWithAccessibleRole(
-          parent, ui::AccessibilityTypes::ROLE_STATICTEXT);
+          parent, ui::AX_ROLE_STATIC_TEXT);
       if (static_text_child) {
-        ui::AccessibleViewState state;
+        ui::AXViewState state;
         static_text_child->GetAccessibleState(&state);
         if (!state.name.empty())
           return base::UTF16ToUTF8(state.name);
@@ -488,8 +488,8 @@ std::string AccessibilityEventRouterViews::GetViewContext(views::View* view) {
 
 // static
 views::View* AccessibilityEventRouterViews::FindDescendantWithAccessibleRole(
-    views::View* view, ui::AccessibilityTypes::Role role) {
-  ui::AccessibleViewState state;
+    views::View* view, ui::AXRole role) {
+  ui::AXViewState state;
   view->GetAccessibleState(&state);
   if (state.role == role)
     return view;
@@ -517,14 +517,14 @@ void AccessibilityEventRouterViews::RecursiveGetMenuItemIndexAndCount(
 
     int previous_count = *count;
     RecursiveGetMenuItemIndexAndCount(child, item, index, count);
-    ui::AccessibleViewState state;
+    ui::AXViewState state;
     child->GetAccessibleState(&state);
-    if (state.role == ui::AccessibilityTypes::ROLE_MENUITEM &&
+    if (state.role == ui::AX_ROLE_MENU_ITEM &&
         *count == previous_count) {
       if (item == child)
         *index = *count;
       (*count)++;
-    } else if (state.role == ui::AccessibilityTypes::ROLE_PUSHBUTTON) {
+    } else if (state.role == ui::AX_ROLE_BUTTON) {
       if (item == child)
         *index = *count;
       (*count)++;
@@ -535,9 +535,9 @@ void AccessibilityEventRouterViews::RecursiveGetMenuItemIndexAndCount(
 // static
 std::string AccessibilityEventRouterViews::RecursiveGetStaticText(
     views::View* view) {
-  ui::AccessibleViewState state;
+  ui::AXViewState state;
   view->GetAccessibleState(&state);
-  if (state.role == ui::AccessibilityTypes::ROLE_STATICTEXT)
+  if (state.role == ui::AX_ROLE_STATIC_TEXT)
     return base::UTF16ToUTF8(state.name);
 
   for (int i = 0; i < view->child_count(); ++i) {
diff --git a/chrome/browser/ui/views/accessibility/accessibility_event_router_views.h b/chrome/browser/ui/views/accessibility/accessibility_event_router_views.h
index fe70582..6b24f9f 100644
--- a/chrome/browser/ui/views/accessibility/accessibility_event_router_views.h
+++ b/chrome/browser/ui/views/accessibility/accessibility_event_router_views.h
@@ -13,7 +13,7 @@
 #include "chrome/browser/accessibility/accessibility_events.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
-#include "ui/base/accessibility/accessibility_types.h"
+#include "ui/accessibility/ax_enums.h"
 
 class Profile;
 
@@ -45,7 +45,7 @@ class AccessibilityEventRouterViews : public content::NotificationObserver {
 
   // Handle an accessibility event generated by a view.
   void HandleAccessibilityEvent(
-      views::View* view, ui::AccessibilityTypes::Event event_type);
+      views::View* view, ui::AXEvent event_type);
 
   // Handle a menu item being focused (separate because a menu item is
   // not necessarily its own view).
@@ -74,63 +74,63 @@ class AccessibilityEventRouterViews : public content::NotificationObserver {
   // Call DispatchAccessibilityEvent using a view storage id.
   static void DispatchEventOnViewStorageId(
       int view_storage_id,
-      ui::AccessibilityTypes::Event event);
+      ui::AXEvent event);
 
   // Checks the type of the view and calls one of the more specific
   // Send*Notification methods, below.
   void DispatchAccessibilityEvent(
       views::View* view,
-      ui::AccessibilityTypes::Event event);
+      ui::AXEvent event);
 
   // Each of these methods constructs an AccessibilityControlInfo object
   // and sends a notification of a specific accessibility event.
   static void SendButtonNotification(
       views::View* view,
-      ui::AccessibilityTypes::Event event,
+      ui::AXEvent event,
       Profile* profile);
   static void SendLinkNotification(
       views::View* view,
-      ui::AccessibilityTypes::Event event,
+      ui::AXEvent event,
       Profile* profile);
   static void SendMenuNotification(
       views::View* view,
-      ui::AccessibilityTypes::Event event,
+      ui::AXEvent event,
       Profile* profile);
   static void SendMenuItemNotification(
       views::View* view,
-      ui::AccessibilityTypes::Event event,
+      ui::AXEvent event,
       Profile* profile);
   static void SendTreeNotification(
       views::View* view,
-      ui::AccessibilityTypes::Event event,
+      ui::AXEvent event,
       Profile* profile);
   static void SendTreeItemNotification(
       views::View* view,
-      ui::AccessibilityTypes::Event event,
+      ui::AXEvent event,
       Profile* profile);
   static void SendTextfieldNotification(
       views::View* view,
-      ui::AccessibilityTypes::Event event,
+      ui::AXEvent event,
       Profile* profile);
   static void SendComboboxNotification(
       views::View* view,
-      ui::AccessibilityTypes::Event event,
+      ui::AXEvent event,
       Profile* profile);
   static void SendCheckboxNotification(
       views::View* view,
-      ui::AccessibilityTypes::Event event,
+      ui::AXEvent event,
       Profile* profile);
   static void SendWindowNotification(
       views::View* view,
-      ui::AccessibilityTypes::Event event,
+      ui::AXEvent event,
       Profile* profile);
   static void SendSliderNotification(
       views::View* view,
-      ui::AccessibilityTypes::Event event,
+      ui::AXEvent event,
       Profile* profile);
   static void SendAlertControlNotification(
       views::View* view,
-      ui::AccessibilityTypes::Event event,
+      ui::AXEvent event,
       Profile* profile);
 
   // Return the name of a view.
@@ -142,7 +142,7 @@ class AccessibilityEventRouterViews : public content::NotificationObserver {
   // Return a descendant of this view with a given accessible role, if found.
   static views::View* FindDescendantWithAccessibleRole(
       views::View* view,
-      ui::AccessibilityTypes::Role role);
+      ui::AXRole role);
 
   // Recursively explore all menu items of |menu| and return in |count|
   // the total number of items, and in |index| the 0-based index of
diff --git a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
index b23e67c..3c4ffbf 100644
--- a/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
+++ b/chrome/browser/ui/views/accessibility/accessibility_event_router_views_unittest.cc
@@ -12,8 +12,8 @@
 #include "chrome/browser/ui/views/accessibility/accessibility_event_router_views.h"
 #include "chrome/test/base/testing_profile.h"
 #include "testing/gtest/include/gtest/gtest.h"
-#include "ui/base/accessibility/accessibility_types.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_enums.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
@@ -46,7 +46,7 @@ class AccessibilityViewsDelegate : public views::TestViewsDelegate {
 
   // Overridden from views::TestViewsDelegate:
   virtual void NotifyAccessibilityEvent(
-      views::View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE {
+      views::View* view, ui::AXEvent event_type) OVERRIDE {
     AccessibilityEventRouterViews::GetInstance()->HandleAccessibilityEvent(
         view, event_type);
   }
@@ -76,12 +76,12 @@ class AccessibilityWindowDelegate : public views::WidgetDelegate {
 class ViewWithNameAndRole : public views::View {
  public:
   explicit ViewWithNameAndRole(const base::string16& name,
-                               ui::AccessibilityTypes::Role role)
+                               ui::AXRole role)
       : name_(name),
         role_(role) {
   }
 
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE {
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE {
     views::View::GetAccessibleState(state);
     state->name = name_;
     state->role = role_;
@@ -91,7 +91,7 @@ class ViewWithNameAndRole : public views::View {
 
  private:
   base::string16 name_;
-  ui::AccessibilityTypes::Role role_;
+  ui::AXRole role_;
   DISALLOW_COPY_AND_ASSIGN(ViewWithNameAndRole);
 };
 
@@ -170,7 +170,7 @@ class AccessibilityEventRouterViewsTest
 
  protected:
   // Handle Focus event.
-  virtual void OnControlEvent(ui::AccessibilityTypes::Event event,
+  virtual void OnControlEvent(ui::AXEvent event,
                             const AccessibilityControlInfo* info) {
     control_event_count_++;
     last_control_type_ = info->type();
@@ -256,7 +256,7 @@ TEST_F(AccessibilityEventRouterViewsTest, TestToolbarContext) {
   // Create a toolbar with a button.
   views::View* contents = new ViewWithNameAndRole(
       ASCIIToUTF16(kToolbarNameASCII),
-      ui::AccessibilityTypes::ROLE_TOOLBAR);
+      ui::AX_ROLE_TOOLBAR);
   views::LabelButton* button = new views::LabelButton(
       NULL, ASCIIToUTF16(kButtonNameASCII));
   button->SetStyle(views::Button::STYLE_BUTTON);
@@ -286,7 +286,7 @@ TEST_F(AccessibilityEventRouterViewsTest, TestAlertContext) {
   // Create an alert with static text and a button, similar to an infobar.
   views::View* contents = new ViewWithNameAndRole(
       base::string16(),
-      ui::AccessibilityTypes::ROLE_ALERT);
+      ui::AX_ROLE_ALERT);
   views::Label* label = new views::Label(ASCIIToUTF16(kAlertTextASCII));
   contents->AddChildView(label);
   views::LabelButton* button = new views::LabelButton(
@@ -319,10 +319,10 @@ TEST_F(AccessibilityEventRouterViewsTest, StateChangeAfterNotification) {
   // Create a toolbar with a button.
   views::View* contents = new ViewWithNameAndRole(
       ASCIIToUTF16(kContentsNameASCII),
-      ui::AccessibilityTypes::ROLE_CLIENT);
+      ui::AX_ROLE_CLIENT);
   ViewWithNameAndRole* child = new ViewWithNameAndRole(
       ASCIIToUTF16(kOldNameASCII),
-      ui::AccessibilityTypes::ROLE_PUSHBUTTON);
+      ui::AX_ROLE_BUTTON);
   child->SetFocusable(true);
   contents->AddChildView(child);
 
@@ -355,10 +355,10 @@ TEST_F(AccessibilityEventRouterViewsTest, NotificationOnDeletedObject) {
   // Create a toolbar with a button.
   views::View* contents = new ViewWithNameAndRole(
       ASCIIToUTF16(kContentsNameASCII),
-      ui::AccessibilityTypes::ROLE_CLIENT);
+      ui::AX_ROLE_CLIENT);
   ViewWithNameAndRole* child = new ViewWithNameAndRole(
       ASCIIToUTF16(kNameASCII),
-      ui::AccessibilityTypes::ROLE_PUSHBUTTON);
+      ui::AX_ROLE_BUTTON);
   child->SetFocusable(true);
   contents->AddChildView(child);
 
@@ -401,7 +401,7 @@ TEST_F(AccessibilityEventRouterViewsTest, AlertsFromWindowAndControl) {
 
   // Send an alert event from the button and let the event loop run.
   control_event_count_ = 0;
-  button->NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true);
+  button->NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
   base::MessageLoop::current()->RunUntilIdle();
 
   EXPECT_EQ(kTypeAlert, last_control_type_);
@@ -411,7 +411,7 @@ TEST_F(AccessibilityEventRouterViewsTest, AlertsFromWindowAndControl) {
   // Send an alert event from the window and let the event loop run.
   control_event_count_ = 0;
   window->GetRootView()->NotifyAccessibilityEvent(
-      ui::AccessibilityTypes::EVENT_ALERT, true);
+      ui::AX_EVENT_ALERT, true);
   base::MessageLoop::current()->RunUntilIdle();
 
   EXPECT_EQ(1, control_event_count_);
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc
index d13c063..b76c1f6 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/themes/theme_properties.h"
 #include "chrome/browser/ui/bookmarks/bookmark_bar_instructions_delegate.h"
 #include "grit/generated_resources.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/theme_provider.h"
 #include "ui/views/controls/label.h"
@@ -98,8 +98,8 @@ void BookmarkBarInstructionsView::ViewHierarchyChanged(
 }
 
 void BookmarkBarInstructionsView::GetAccessibleState(
-    ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_GROUPING;
+    ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_GROUP;
 }
 
 void BookmarkBarInstructionsView::LinkClicked(views::Link* source,
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h
index d5b93a7..090c2b0 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_instructions_view.h
@@ -36,7 +36,7 @@ class BookmarkBarInstructionsView : public views::View,
   virtual void OnThemeChanged() OVERRIDE;
   virtual void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
 
   // views::LinkListener overrides.
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
index 6aa0130..ebaf328 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.cc
@@ -61,7 +61,7 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -402,9 +402,9 @@ class BookmarkBarView::ButtonSeparatorView : public views::View {
     return gfx::Size(kSeparatorWidth, 1);
   }
 
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE {
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE {
     state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_SEPARATOR);
-    state->role = ui::AccessibilityTypes::ROLE_SEPARATOR;
+    state->role = ui::AX_ROLE_SPLITTER;
   }
 
  private:
@@ -919,8 +919,8 @@ const char* BookmarkBarView::GetClassName() const {
   return kViewClassName;
 }
 
-void BookmarkBarView::GetAccessibleState(ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_TOOLBAR;
+void BookmarkBarView::GetAccessibleState(ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_TOOLBAR;
   state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_BOOKMARKS);
 }
 
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
index 6e166fa..3bdb513 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view.h
@@ -182,7 +182,7 @@ class BookmarkBarView : public DetachableToolbarView,
   virtual const char* GetClassName() const OVERRIDE;
 
   // AccessiblePaneView:
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
 
   // gfx::AnimationDelegate:
   virtual void AnimationProgressed(const gfx::Animation* animation) OVERRIDE;
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
index 220b428..f9c3842 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc
@@ -32,7 +32,6 @@
 #include "content/public/browser/page_navigator.h"
 #include "content/public/test/test_browser_thread.h"
 #include "grit/generated_resources.h"
-#include "ui/base/accessibility/accessibility_types.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/base/test/ui_controls.h"
 #include "ui/events/keycodes/keyboard_codes.h"
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
index cd4e167..1c7acff 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.cc
@@ -19,7 +19,7 @@
 #include "content/public/browser/user_metrics.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/keycodes/keyboard_codes.h"
@@ -295,7 +295,7 @@ gfx::Size BookmarkBubbleView::GetMinimumSize() {
   return size;
 }
 
-void BookmarkBubbleView::GetAccessibleState(ui::AccessibleViewState* state) {
+void BookmarkBubbleView::GetAccessibleState(ui::AXViewState* state) {
   BubbleDelegateView::GetAccessibleState(state);
   state->name =
       l10n_util::GetStringUTF16(
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h
index a01c608..d80f763 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_bubble_view.h
@@ -77,7 +77,7 @@ class BookmarkBubbleView : public views::BubbleDelegateView,
 
   // Overridden from views::View:
   virtual gfx::Size GetMinimumSize() OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
 
   // Overridden from views::ButtonListener:
   // Closes the bubble or opens the edit dialog.
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
index a733d51..ecac9bf 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.cc
@@ -23,7 +23,7 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/events/event.h"
 #include "ui/views/background.h"
@@ -164,10 +164,10 @@ bool BookmarkEditorView::HandleKeyEvent(views::Textfield* sender,
     return false;
 }
 
-void BookmarkEditorView::GetAccessibleState(ui::AccessibleViewState* state) {
+void BookmarkEditorView::GetAccessibleState(ui::AXViewState* state) {
   state->name =
       l10n_util::GetStringUTF16(IDS_BOOKMARK_EDITOR_TITLE);
-  state->role = ui::AccessibilityTypes::ROLE_DIALOG;
+  state->role = ui::AX_ROLE_DIALOG;
 }
 
 void BookmarkEditorView::ButtonPressed(views::Button* sender,
diff --git a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
index 3bdf354..b62fa49 100644
--- a/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
+++ b/chrome/browser/ui/views/bookmarks/bookmark_editor_view.h
@@ -89,7 +89,7 @@ class BookmarkEditorView : public BookmarkEditor,
 
   // views::View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
 
   // views::TreeViewController:
   virtual void OnTreeViewSelectionChanged(views::TreeView* tree_view) OVERRIDE;
diff --git a/chrome/browser/ui/views/chrome_views_delegate.cc b/chrome/browser/ui/views/chrome_views_delegate.cc
index 70c4236..e434add 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.cc
+++ b/chrome/browser/ui/views/chrome_views_delegate.cc
@@ -140,7 +140,7 @@ bool ChromeViewsDelegate::GetSavedWindowPlacement(
 }
 
 void ChromeViewsDelegate::NotifyAccessibilityEvent(
-    views::View* view, ui::AccessibilityTypes::Event event_type) {
+    views::View* view, ui::AXEvent event_type) {
   AccessibilityEventRouterViews::GetInstance()->HandleAccessibilityEvent(
       view, event_type);
 }
diff --git a/chrome/browser/ui/views/chrome_views_delegate.h b/chrome/browser/ui/views/chrome_views_delegate.h
index 95f827f..75d5a5a 100644
--- a/chrome/browser/ui/views/chrome_views_delegate.h
+++ b/chrome/browser/ui/views/chrome_views_delegate.h
@@ -8,7 +8,7 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "build/build_config.h"
-#include "ui/base/accessibility/accessibility_types.h"
+#include "ui/accessibility/ax_enums.h"
 #include "ui/views/views_delegate.h"
 
 class ChromeViewsDelegate : public views::ViewsDelegate {
@@ -27,7 +27,7 @@ class ChromeViewsDelegate : public views::ViewsDelegate {
       gfx::Rect* bounds,
       ui::WindowShowState* show_state) const OVERRIDE;
   virtual void NotifyAccessibilityEvent(
-      views::View* view, ui::AccessibilityTypes::Event event_type) OVERRIDE;
+      views::View* view, ui::AXEvent event_type) OVERRIDE;
   virtual void NotifyMenuItemFocused(const base::string16& menu_name,
                                      const base::string16& menu_item_name,
                                      int item_index,
diff --git a/chrome/browser/ui/views/conflicting_module_view_win.cc b/chrome/browser/ui/views/conflicting_module_view_win.cc
index 1e3614e..c99e0d1 100644
--- a/chrome/browser/ui/views/conflicting_module_view_win.cc
+++ b/chrome/browser/ui/views/conflicting_module_view_win.cc
@@ -16,7 +16,7 @@
 #include "grit/generated_resources.h"
 #include "grit/locale_settings.h"
 #include "grit/theme_resources.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/label_button.h"
@@ -211,14 +211,14 @@ void ConflictingModuleView::ButtonPressed(views::Button* sender,
 }
 
 void ConflictingModuleView::GetAccessibleState(
-    ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_ALERT;
+    ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_ALERT;
 }
 
 void ConflictingModuleView::ViewHierarchyChanged(
   const ViewHierarchyChangedDetails& details) {
   if (details.is_add && details.child == this)
-    NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true);
+    NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
 }
 
 void ConflictingModuleView::Observe(
diff --git a/chrome/browser/ui/views/conflicting_module_view_win.h b/chrome/browser/ui/views/conflicting_module_view_win.h
index 04bd6b1..1d882dd 100644
--- a/chrome/browser/ui/views/conflicting_module_view_win.h
+++ b/chrome/browser/ui/views/conflicting_module_view_win.h
@@ -49,7 +49,7 @@ class ConflictingModuleView : public views::BubbleDelegateView,
                              const ui::Event& event) OVERRIDE;
 
   // views::View implementation.
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) OVERRIDE;
 
diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.cc b/chrome/browser/ui/views/critical_notification_bubble_view.cc
index 7b7774d..7e53be6 100644
--- a/chrome/browser/ui/views/critical_notification_bubble_view.cc
+++ b/chrome/browser/ui/views/critical_notification_bubble_view.cc
@@ -16,8 +16,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/base/accelerators/accelerator.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/views/controls/button/label_button.h"
@@ -136,14 +136,14 @@ void CriticalNotificationBubbleView::WindowClosing() {
 }
 
 void CriticalNotificationBubbleView::GetAccessibleState(
-    ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_ALERT;
+    ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_ALERT;
 }
 
 void CriticalNotificationBubbleView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && details.child == this)
-    NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true);
+    NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
 }
 
 bool CriticalNotificationBubbleView::AcceleratorPressed(
diff --git a/chrome/browser/ui/views/critical_notification_bubble_view.h b/chrome/browser/ui/views/critical_notification_bubble_view.h
index f387c29..5d595d1 100644
--- a/chrome/browser/ui/views/critical_notification_bubble_view.h
+++ b/chrome/browser/ui/views/critical_notification_bubble_view.h
@@ -32,7 +32,7 @@ class CriticalNotificationBubbleView : public views::BubbleDelegateView,
   virtual void WindowClosing() OVERRIDE;
 
   // views::View overrides:
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) OVERRIDE;
 
diff --git a/chrome/browser/ui/views/download/download_item_view.cc b/chrome/browser/ui/views/download/download_item_view.cc
index e93b5eb..5bc9bfc 100644
--- a/chrome/browser/ui/views/download/download_item_view.cc
+++ b/chrome/browser/ui/views/download/download_item_view.cc
@@ -36,7 +36,7 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "third_party/icu/source/common/unicode/uchar.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/theme_provider.h"
@@ -492,13 +492,13 @@ bool DownloadItemView::GetTooltipText(const gfx::Point& p,
   return true;
 }
 
-void DownloadItemView::GetAccessibleState(ui::AccessibleViewState* state) {
+void DownloadItemView::GetAccessibleState(ui::AXViewState* state) {
   state->name = accessible_name_;
-  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
+  state->role = ui::AX_ROLE_BUTTON;
   if (model_.IsDangerous()) {
-    state->state = ui::AccessibilityTypes::STATE_UNAVAILABLE;
+    state->state = ui::AX_STATE_DISABLED;
   } else {
-    state->state = ui::AccessibilityTypes::STATE_HASPOPUP;
+    state->state = ui::AX_STATE_HASPOPUP;
   }
 }
 
@@ -1317,7 +1317,7 @@ void DownloadItemView::UpdateAccessibleName() {
   // has changed so they can announce it immediately.
   if (new_name != accessible_name_) {
     accessible_name_ = new_name;
-    NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_NAME_CHANGED, true);
+    NotifyAccessibilityEvent(ui::AX_EVENT_TEXT_CHANGED, true);
   }
 }
 
diff --git a/chrome/browser/ui/views/download/download_item_view.h b/chrome/browser/ui/views/download/download_item_view.h
index 6a78b07..0dffb2e 100644
--- a/chrome/browser/ui/views/download/download_item_view.h
+++ b/chrome/browser/ui/views/download/download_item_view.h
@@ -86,7 +86,7 @@ class DownloadItemView : public views::ButtonListener,
   virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
   virtual bool GetTooltipText(const gfx::Point& p,
                               base::string16* tooltip) const OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual void OnThemeChanged() OVERRIDE;
 
   // Overridden from ui::EventHandler:
diff --git a/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc b/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc
index c94be9e..4ccf89c 100644
--- a/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc
+++ b/chrome/browser/ui/views/extensions/extension_message_bubble_view.cc
@@ -19,7 +19,7 @@
 #include "extensions/browser/extension_prefs.h"
 #include "extensions/browser/extension_system.h"
 #include "grit/locale_settings.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/label.h"
@@ -319,14 +319,14 @@ void ExtensionMessageBubbleView::LinkClicked(views::Link* source,
 }
 
 void ExtensionMessageBubbleView::GetAccessibleState(
-    ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_ALERT;
+    ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_ALERT;
 }
 
 void ExtensionMessageBubbleView::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && details.child == this)
-    NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true);
+    NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
 }
 
 }  // namespace extensions
diff --git a/chrome/browser/ui/views/extensions/extension_message_bubble_view.h b/chrome/browser/ui/views/extensions/extension_message_bubble_view.h
index 741173b..a388a97 100644
--- a/chrome/browser/ui/views/extensions/extension_message_bubble_view.h
+++ b/chrome/browser/ui/views/extensions/extension_message_bubble_view.h
@@ -63,7 +63,7 @@ class ExtensionMessageBubbleView : public ExtensionMessageBubble,
   virtual void LinkClicked(views::Link* source, int event_flags) OVERRIDE;
 
   // views::View implementation.
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) OVERRIDE;
 
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
index 278f56b..a33b4ae 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.cc
@@ -22,9 +22,9 @@
 #include "content/public/browser/web_contents.h"
 #include "grit/ash_resources.h"
 #include "grit/theme_resources.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
-#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
@@ -321,8 +321,8 @@ bool BrowserNonClientFrameViewAsh::HitTestRect(const gfx::Rect& rect) const {
 }
 
 void BrowserNonClientFrameViewAsh::GetAccessibleState(
-    ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_TITLEBAR;
+    ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_TITLE_BAR;
 }
 
 gfx::Size BrowserNonClientFrameViewAsh::GetMinimumSize() {
diff --git a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
index 944944c..848a746 100644
--- a/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
+++ b/chrome/browser/ui/views/frame/browser_non_client_frame_view_ash.h
@@ -55,7 +55,7 @@ class BrowserNonClientFrameViewAsh
   virtual void Layout() OVERRIDE;
   virtual const char* GetClassName() const OVERRIDE;
   virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual gfx::Size GetMinimumSize() OVERRIDE;
   virtual void OnThemeChanged() OVERRIDE;
 
diff --git a/chrome/browser/ui/views/frame/browser_view.cc b/chrome/browser/ui/views/frame/browser_view.cc
index 3a490ae..a3ca306 100644
--- a/chrome/browser/ui/views/frame/browser_view.cc
+++ b/chrome/browser/ui/views/frame/browser_view.cc
@@ -113,8 +113,8 @@
 #include "grit/ui_resources.h"
 #include "grit/ui_strings.h"
 #include "grit/webkit_resources.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/accelerators/accelerator.h"
-#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -1863,8 +1863,8 @@ void BrowserView::ChildPreferredSizeChanged(View* child) {
   Layout();
 }
 
-void BrowserView::GetAccessibleState(ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_CLIENT;
+void BrowserView::GetAccessibleState(ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_CLIENT;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/views/frame/browser_view.h b/chrome/browser/ui/views/frame/browser_view.h
index 4a79c97..33da1ae 100644
--- a/chrome/browser/ui/views/frame/browser_view.h
+++ b/chrome/browser/ui/views/frame/browser_view.h
@@ -454,7 +454,7 @@ class BrowserView : public BrowserWindow,
   virtual void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) OVERRIDE;
   virtual void ChildPreferredSizeChanged(View* child) OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
 
   // Overridden from ui::AcceleratorTarget:
   virtual bool AcceleratorPressed(const ui::Accelerator& accelerator) OVERRIDE;
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
index 04f1327..2cae80b 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.cc
@@ -31,7 +31,7 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/hit_test.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -350,8 +350,8 @@ bool OpaqueBrowserFrameView::HitTestRect(const gfx::Rect& rect) const {
 }
 
 void OpaqueBrowserFrameView::GetAccessibleState(
-    ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_TITLEBAR;
+    ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_TITLE_BAR;
 }
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
index 296504d..3673128 100644
--- a/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
+++ b/chrome/browser/ui/views/frame/opaque_browser_frame_view.h
@@ -60,7 +60,7 @@ class OpaqueBrowserFrameView : public BrowserNonClientFrameView,
 
   // Overridden from views::View:
   virtual bool HitTestRect(const gfx::Rect& rect) const OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender, const ui::Event& event)
diff --git a/chrome/browser/ui/views/infobars/infobar_container_view.cc b/chrome/browser/ui/views/infobars/infobar_container_view.cc
index e7e9af5..ba84618 100644
--- a/chrome/browser/ui/views/infobars/infobar_container_view.cc
+++ b/chrome/browser/ui/views/infobars/infobar_container_view.cc
@@ -7,7 +7,7 @@
 #include "chrome/browser/ui/view_ids.h"
 #include "chrome/browser/ui/views/infobars/infobar_view.h"
 #include "grit/generated_resources.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 
 // static
@@ -47,8 +47,8 @@ void InfoBarContainerView::Layout() {
   }
 }
 
-void InfoBarContainerView::GetAccessibleState(ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_GROUPING;
+void InfoBarContainerView::GetAccessibleState(ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_GROUP;
   state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_INFOBAR_CONTAINER);
 }
 
diff --git a/chrome/browser/ui/views/infobars/infobar_container_view.h b/chrome/browser/ui/views/infobars/infobar_container_view.h
index 73cd321..a41b270 100644
--- a/chrome/browser/ui/views/infobars/infobar_container_view.h
+++ b/chrome/browser/ui/views/infobars/infobar_container_view.h
@@ -22,7 +22,7 @@ class InfoBarContainerView : public views::AccessiblePaneView,
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual const char* GetClassName() const OVERRIDE;
   virtual void Layout() OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
 
   // InfobarContainer:
   virtual void PlatformSpecificAddInfoBar(InfoBar* infobar,
diff --git a/chrome/browser/ui/views/infobars/infobar_view.cc b/chrome/browser/ui/views/infobars/infobar_view.cc
index 038867e..9f45fd6 100644
--- a/chrome/browser/ui/views/infobars/infobar_view.cc
+++ b/chrome/browser/ui/views/infobars/infobar_view.cc
@@ -18,7 +18,7 @@
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
@@ -394,7 +394,7 @@ void InfoBarView::PlatformSpecificShow(bool animate) {
   // that if we gain focus we'll know what the previously-focused element was.
   SetFocusManager(GetFocusManager());
 
-  NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true);
+  NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
 }
 
 void InfoBarView::PlatformSpecificHide(bool animate) {
@@ -424,11 +424,11 @@ void InfoBarView::PlatformSpecificOnHeightsRecalculated() {
   InvalidateLayout();
 }
 
-void InfoBarView::GetAccessibleState(ui::AccessibleViewState* state) {
+void InfoBarView::GetAccessibleState(ui::AXViewState* state) {
   state->name = l10n_util::GetStringUTF16(
       (delegate()->GetInfoBarType() == InfoBarDelegate::WARNING_TYPE) ?
           IDS_ACCNAME_INFOBAR_WARNING : IDS_ACCNAME_INFOBAR_PAGE_ACTION);
-  state->role = ui::AccessibilityTypes::ROLE_ALERT;
+  state->role = ui::AX_ROLE_ALERT;
 }
 
 gfx::Size InfoBarView::GetPreferredSize() {
@@ -446,6 +446,6 @@ void InfoBarView::OnWillChangeFocus(View* focused_before, View* focused_now) {
   // infobar.
   if (focused_before && focused_now && !Contains(focused_before) &&
       Contains(focused_now)) {
-    NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true);
+    NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
   }
 }
diff --git a/chrome/browser/ui/views/infobars/infobar_view.h b/chrome/browser/ui/views/infobars/infobar_view.h
index 3db7435..769b910 100644
--- a/chrome/browser/ui/views/infobars/infobar_view.h
+++ b/chrome/browser/ui/views/infobars/infobar_view.h
@@ -124,7 +124,7 @@ class InfoBarView : public InfoBar,
   virtual void PlatformSpecificOnHeightsRecalculated() OVERRIDE;
 
   // views::View:
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual void PaintChildren(gfx::Canvas* canvas) OVERRIDE;
 
diff --git a/chrome/browser/ui/views/location_bar/bubble_icon_view.cc b/chrome/browser/ui/views/location_bar/bubble_icon_view.cc
index 001e1e4..fdcf0a1 100644
--- a/chrome/browser/ui/views/location_bar/bubble_icon_view.cc
+++ b/chrome/browser/ui/views/location_bar/bubble_icon_view.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/command_updater.h"
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/events/event.h"
 
 BubbleIconView::BubbleIconView(CommandUpdater* command_updater, int command_id)
@@ -20,9 +20,9 @@ BubbleIconView::BubbleIconView(CommandUpdater* command_updater, int command_id)
 BubbleIconView::~BubbleIconView() {
 }
 
-void BubbleIconView::GetAccessibleState(ui::AccessibleViewState* state) {
+void BubbleIconView::GetAccessibleState(ui::AXViewState* state) {
   views::ImageView::GetAccessibleState(state);
-  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
+  state->role = ui::AX_ROLE_BUTTON;
 }
 
 bool BubbleIconView::GetTooltipText(const gfx::Point& p,
diff --git a/chrome/browser/ui/views/location_bar/bubble_icon_view.h b/chrome/browser/ui/views/location_bar/bubble_icon_view.h
index d2dfde3..8133b0f 100644
--- a/chrome/browser/ui/views/location_bar/bubble_icon_view.h
+++ b/chrome/browser/ui/views/location_bar/bubble_icon_view.h
@@ -28,7 +28,7 @@ class BubbleIconView : public views::ImageView {
   virtual void OnExecuting(ExecuteSource execute_source) = 0;
 
   // views::ImageView:
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual bool GetTooltipText(const gfx::Point& p, base::string16* tooltip)
       const OVERRIDE;
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.cc b/chrome/browser/ui/views/location_bar/location_bar_view.cc
index 0fc3a63..ce0ff79 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.cc
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.cc
@@ -70,7 +70,7 @@
 #include "extensions/common/permissions/permissions_data.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
@@ -593,7 +593,7 @@ void LocationBarView::OnFocus() {
   // Chrome OS.  It is noop on Win. This should be removed once
   // Chrome OS migrates to aura, which uses Views' textfield that receives
   // focus. See crbug.com/106428.
-  NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_FOCUS, false);
+  NotifyAccessibilityEvent(ui::AX_EVENT_FOCUS, false);
 
   // Then focus the native location view which implements accessibility for
   // Windows.
@@ -1123,11 +1123,11 @@ bool LocationBarView::HasFocus() const {
   return omnibox_view_->model()->has_focus();
 }
 
-void LocationBarView::GetAccessibleState(ui::AccessibleViewState* state) {
+void LocationBarView::GetAccessibleState(ui::AXViewState* state) {
   if (!IsInitialized())
     return;
 
-  state->role = ui::AccessibilityTypes::ROLE_LOCATION_BAR;
+  state->role = ui::AX_ROLE_LOCATION_BAR;
   state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_LOCATION);
   state->value = omnibox_view_->GetText();
 
@@ -1138,7 +1138,7 @@ void LocationBarView::GetAccessibleState(ui::AccessibleViewState* state) {
   state->selection_end = entry_end;
 
   if (is_popup_mode_) {
-    state->state |= ui::AccessibilityTypes::STATE_READONLY;
+    state->state |= ui::AX_STATE_READ_ONLY;
   } else {
     state->set_value_callback =
         base::Bind(&LocationBarView::AccessibilitySetValue,
diff --git a/chrome/browser/ui/views/location_bar/location_bar_view.h b/chrome/browser/ui/views/location_bar/location_bar_view.h
index b7c7df3..51489ba 100644
--- a/chrome/browser/ui/views/location_bar/location_bar_view.h
+++ b/chrome/browser/ui/views/location_bar/location_bar_view.h
@@ -263,7 +263,7 @@ class LocationBarView : public LocationBar,
   // views::View:
   virtual const char* GetClassName() const OVERRIDE;
   virtual bool HasFocus() const OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual void OnBoundsChanged(const gfx::Rect& previous_bounds) OVERRIDE;
 
   // views::ButtonListener:
diff --git a/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.cc b/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.cc
index 68c4e01..c003bb7 100644
--- a/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.cc
+++ b/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.cc
@@ -9,7 +9,7 @@
 #include "chrome/browser/ui/views/open_pdf_in_reader_bubble_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/views/widget/widget.h"
@@ -51,9 +51,9 @@ void OpenPDFInReaderView::ShowBubble() {
   bubble_->GetWidget()->Show();
 }
 
-void OpenPDFInReaderView::GetAccessibleState(ui::AccessibleViewState* state) {
+void OpenPDFInReaderView::GetAccessibleState(ui::AXViewState* state) {
   state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_OPEN_PDF_IN_READER);
-  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
+  state->role = ui::AX_ROLE_BUTTON;
 }
 
 bool OpenPDFInReaderView::OnMousePressed(const ui::MouseEvent& event) {
diff --git a/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.h b/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.h
index 867e8d8..bbe9765 100644
--- a/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.h
+++ b/chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.h
@@ -29,7 +29,7 @@ class OpenPDFInReaderView : public views::ImageView,
   void ShowBubble();
 
   // views::ImageView:
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
   virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.cc b/chrome/browser/ui/views/location_bar/page_action_image_view.cc
index 433cd43..fc77014 100644
--- a/chrome/browser/ui/views/location_bar/page_action_image_view.cc
+++ b/chrome/browser/ui/views/location_bar/page_action_image_view.cc
@@ -22,7 +22,7 @@
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/webui/extensions/extension_info_ui.h"
 #include "extensions/common/extension.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/events/event.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image.h"
@@ -112,8 +112,8 @@ void PageActionImageView::ExecuteAction(
   }
 }
 
-void PageActionImageView::GetAccessibleState(ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
+void PageActionImageView::GetAccessibleState(ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_BUTTON;
   state->name = base::UTF8ToUTF16(tooltip_);
 }
 
diff --git a/chrome/browser/ui/views/location_bar/page_action_image_view.h b/chrome/browser/ui/views/location_bar/page_action_image_view.h
index b8e29ef..0d39ea1 100644
--- a/chrome/browser/ui/views/location_bar/page_action_image_view.h
+++ b/chrome/browser/ui/views/location_bar/page_action_image_view.h
@@ -49,7 +49,7 @@ class PageActionImageView : public views::ImageView,
   }
 
   // Overridden from views::View:
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
   virtual bool OnKeyPressed(const ui::KeyEvent& event) OVERRIDE;
diff --git a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc
index 4bb9cca..fa761fa 100644
--- a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc
+++ b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.cc
@@ -7,7 +7,7 @@
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "chrome/browser/ui/views/location_bar/page_action_image_view.h"
 #include "chrome/common/extensions/manifest_handlers/icons_handler.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 
 using content::WebContents;
 
@@ -19,8 +19,8 @@ PageActionWithBadgeView::PageActionWithBadgeView(
 }
 
 void PageActionWithBadgeView::GetAccessibleState(
-    ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_GROUPING;
+    ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_GROUP;
 }
 
 gfx::Size PageActionWithBadgeView::GetPreferredSize() {
diff --git a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h
index 82cf0e0..15d789f 100644
--- a/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h
+++ b/chrome/browser/ui/views/location_bar/page_action_with_badge_view.h
@@ -24,7 +24,7 @@ class PageActionWithBadgeView : public views::View {
   PageActionImageView* image_view() { return image_view_; }
 
   // views::View:
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
   void UpdateVisibility(content::WebContents* contents, const GURL& url);
diff --git a/chrome/browser/ui/views/location_bar/zoom_view.cc b/chrome/browser/ui/views/location_bar/zoom_view.cc
index aca3096..7be3dc3 100644
--- a/chrome/browser/ui/views/location_bar/zoom_view.cc
+++ b/chrome/browser/ui/views/location_bar/zoom_view.cc
@@ -10,7 +10,7 @@
 #include "chrome/browser/ui/zoom/zoom_controller.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
@@ -41,9 +41,9 @@ void ZoomView::Update(ZoomController* zoom_controller) {
   SetVisible(true);
 }
 
-void ZoomView::GetAccessibleState(ui::AccessibleViewState* state) {
+void ZoomView::GetAccessibleState(ui::AXViewState* state) {
   state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_ZOOM);
-  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
+  state->role = ui::AX_ROLE_BUTTON;
 }
 
 bool ZoomView::GetTooltipText(const gfx::Point& p,
diff --git a/chrome/browser/ui/views/location_bar/zoom_view.h b/chrome/browser/ui/views/location_bar/zoom_view.h
index 2af26ec..064d29e 100644
--- a/chrome/browser/ui/views/location_bar/zoom_view.h
+++ b/chrome/browser/ui/views/location_bar/zoom_view.h
@@ -29,7 +29,7 @@ class ZoomView : public views::ImageView {
 
  private:
   // views::ImageView:
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual bool GetTooltipText(const gfx::Point& p,
                               base::string16* tooltip) const OVERRIDE;
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
diff --git a/chrome/browser/ui/views/message_center/message_center_widget_delegate.cc b/chrome/browser/ui/views/message_center/message_center_widget_delegate.cc
index 16b3eff..816e685 100644
--- a/chrome/browser/ui/views/message_center/message_center_widget_delegate.cc
+++ b/chrome/browser/ui/views/message_center/message_center_widget_delegate.cc
@@ -8,7 +8,7 @@
 
 #include "chrome/browser/ui/views/message_center/message_center_frame_view.h"
 #include "content/public/browser/user_metrics.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/gfx/screen.h"
 #include "ui/message_center/message_center_style.h"
 #include "ui/message_center/message_center_util.h"
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
index 7a89ef1..bd87afa 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.cc
@@ -29,7 +29,7 @@
 #include "grit/ui_strings.h"
 #include "net/base/escape.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/clipboard/scoped_clipboard_writer.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/dragdrop/os_exchange_data.h"
@@ -220,9 +220,9 @@ void OmniboxViewViews::OnGestureEvent(ui::GestureEvent* event) {
   views::Textfield::OnGestureEvent(event);
 }
 
-void OmniboxViewViews::GetAccessibleState(ui::AccessibleViewState* state) {
+void OmniboxViewViews::GetAccessibleState(ui::AXViewState* state) {
   location_bar_view_->GetAccessibleState(state);
-  state->role = ui::AccessibilityTypes::ROLE_TEXT;
+  state->role = ui::AX_ROLE_TEXT_FIELD;
 }
 
 bool OmniboxViewViews::OnMousePressed(const ui::MouseEvent& event) {
diff --git a/chrome/browser/ui/views/omnibox/omnibox_view_views.h b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
index b2036ff..8dae1d9 100644
--- a/chrome/browser/ui/views/omnibox/omnibox_view_views.h
+++ b/chrome/browser/ui/views/omnibox/omnibox_view_views.h
@@ -56,7 +56,7 @@ class OmniboxViewViews
   virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
   virtual const char* GetClassName() const OVERRIDE;
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
   virtual bool OnMouseDragged(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
diff --git a/chrome/browser/ui/views/passwords/manage_passwords_icon_view.cc b/chrome/browser/ui/views/passwords/manage_passwords_icon_view.cc
index 76b21cf..b8a9a85 100644
--- a/chrome/browser/ui/views/passwords/manage_passwords_icon_view.cc
+++ b/chrome/browser/ui/views/passwords/manage_passwords_icon_view.cc
@@ -8,7 +8,6 @@
 #include "chrome/browser/ui/views/passwords/manage_passwords_bubble_view.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 
diff --git a/chrome/browser/ui/views/tabs/tab.cc b/chrome/browser/ui/views/tabs/tab.cc
index b8c169e..3c0b397 100644
--- a/chrome/browser/ui/views/tabs/tab.cc
+++ b/chrome/browser/ui/views/tabs/tab.cc
@@ -24,7 +24,7 @@
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
 #include "third_party/skia/include/effects/SkGradientShader.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/models/list_selection_model.h"
@@ -1077,8 +1077,8 @@ void Tab::OnGestureEvent(ui::GestureEvent* event) {
   event->SetHandled();
 }
 
-void Tab::GetAccessibleState(ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_PAGETAB;
+void Tab::GetAccessibleState(ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_TAB;
   state->name = data_.title;
 }
 
diff --git a/chrome/browser/ui/views/tabs/tab.h b/chrome/browser/ui/views/tabs/tab.h
index a3a6e09..d5b71cd 100644
--- a/chrome/browser/ui/views/tabs/tab.h
+++ b/chrome/browser/ui/views/tabs/tab.h
@@ -180,7 +180,7 @@ class Tab : public gfx::AnimationDelegate,
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseMoved(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
 
   // Overridden from ui::EventHandler:
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
diff --git a/chrome/browser/ui/views/tabs/tab_strip.cc b/chrome/browser/ui/views/tabs/tab_strip.cc
index 3aee65e..caee32d 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.cc
+++ b/chrome/browser/ui/views/tabs/tab_strip.cc
@@ -30,7 +30,7 @@
 #include "content/public/browser/user_metrics.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/default_theme_provider.h"
 #include "ui/base/dragdrop/drag_drop_types.h"
 #include "ui/base/l10n/l10n_util.h"
@@ -1450,8 +1450,8 @@ int TabStrip::OnPerformDrop(const DropTargetEvent& event) {
   return GetDropEffect(event);
 }
 
-void TabStrip::GetAccessibleState(ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_PAGETABLIST;
+void TabStrip::GetAccessibleState(ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_TAB_LIST;
 }
 
 views::View* TabStrip::GetEventHandlerForRect(const gfx::Rect& rect) {
diff --git a/chrome/browser/ui/views/tabs/tab_strip.h b/chrome/browser/ui/views/tabs/tab_strip.h
index 5939564..0e717be 100644
--- a/chrome/browser/ui/views/tabs/tab_strip.h
+++ b/chrome/browser/ui/views/tabs/tab_strip.h
@@ -223,7 +223,7 @@ class TabStrip : public views::View,
   virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE;
   virtual void OnDragExited() OVERRIDE;
   virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual views::View* GetEventHandlerForRect(const gfx::Rect& rect) OVERRIDE;
   virtual views::View* GetTooltipHandlerForPoint(
       const gfx::Point& point) OVERRIDE;
diff --git a/chrome/browser/ui/views/toolbar/browser_action_view.cc b/chrome/browser/ui/views/toolbar/browser_action_view.cc
index 780e8c3..7052773 100644
--- a/chrome/browser/ui/views/toolbar/browser_action_view.cc
+++ b/chrome/browser/ui/views/toolbar/browser_action_view.cc
@@ -22,7 +22,7 @@
 #include "extensions/common/manifest_constants.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/events/event.h"
@@ -88,10 +88,10 @@ void BrowserActionView::Layout() {
                      BrowserActionsContainer::IconHeight());
 }
 
-void BrowserActionView::GetAccessibleState(ui::AccessibleViewState* state) {
+void BrowserActionView::GetAccessibleState(ui::AXViewState* state) {
   state->name = l10n_util::GetStringUTF16(
       IDS_ACCNAME_EXTENSIONS_BROWSER_ACTION);
-  state->role = ui::AccessibilityTypes::ROLE_GROUPING;
+  state->role = ui::AX_ROLE_GROUP;
 }
 
 gfx::Size BrowserActionView::GetPreferredSize() {
@@ -177,9 +177,9 @@ bool BrowserActionButton::CanHandleAccelerators() const {
   return true;
 }
 
-void BrowserActionButton::GetAccessibleState(ui::AccessibleViewState* state) {
+void BrowserActionButton::GetAccessibleState(ui::AXViewState* state) {
   views::MenuButton::GetAccessibleState(state);
-  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
+  state->role = ui::AX_ROLE_BUTTON;
 }
 
 void BrowserActionButton::ButtonPressed(views::Button* sender,
diff --git a/chrome/browser/ui/views/toolbar/browser_action_view.h b/chrome/browser/ui/views/toolbar/browser_action_view.h
index 7d89919..2138e82 100644
--- a/chrome/browser/ui/views/toolbar/browser_action_view.h
+++ b/chrome/browser/ui/views/toolbar/browser_action_view.h
@@ -76,7 +76,7 @@ class BrowserActionView : public views::View {
 
   // Overridden from views::View:
   virtual void Layout() OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
  protected:
@@ -130,7 +130,7 @@ class BrowserActionButton : public views::MenuButton,
 
   // Overridden from views::View:
   virtual bool CanHandleAccelerators() const OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
 
   // Overridden from views::ButtonListener:
   virtual void ButtonPressed(views::Button* sender,
diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.cc b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
index 75ea483..88b7138 100644
--- a/chrome/browser/ui/views/toolbar/browser_actions_container.cc
+++ b/chrome/browser/ui/views/toolbar/browser_actions_container.cc
@@ -29,7 +29,7 @@
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_resources.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/dragdrop/drag_utils.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
@@ -360,8 +360,8 @@ int BrowserActionsContainer::OnPerformDrop(
 }
 
 void BrowserActionsContainer::GetAccessibleState(
-    ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_GROUPING;
+    ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_GROUP;
   state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_EXTENSIONS);
 }
 
diff --git a/chrome/browser/ui/views/toolbar/browser_actions_container.h b/chrome/browser/ui/views/toolbar/browser_actions_container.h
index bb3cff0..e1d425f 100644
--- a/chrome/browser/ui/views/toolbar/browser_actions_container.h
+++ b/chrome/browser/ui/views/toolbar/browser_actions_container.h
@@ -170,7 +170,7 @@ class BrowserActionsContainer
   virtual int OnDragUpdated(const ui::DropTargetEvent& event) OVERRIDE;
   virtual void OnDragExited() OVERRIDE;
   virtual int OnPerformDrop(const ui::DropTargetEvent& event) OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
 
   // Overridden from views::MenuButtonListener:
   virtual void OnMenuButtonClicked(views::View* source,
diff --git a/chrome/browser/ui/views/toolbar/reload_button.cc b/chrome/browser/ui/views/toolbar/reload_button.cc
index d9a7b7f..4f248f2 100644
--- a/chrome/browser/ui/views/toolbar/reload_button.cc
+++ b/chrome/browser/ui/views/toolbar/reload_button.cc
@@ -114,7 +114,7 @@ const char* ReloadButton::GetClassName() const {
   return kViewClassName;
 }
 
-void ReloadButton::GetAccessibleState(ui::AccessibleViewState* state) {
+void ReloadButton::GetAccessibleState(ui::AXViewState* state) {
   if (menu_enabled_)
     ToolbarButton::GetAccessibleState(state);
   else
diff --git a/chrome/browser/ui/views/toolbar/reload_button.h b/chrome/browser/ui/views/toolbar/reload_button.h
index 057bc6c..f3d1f5d 100644
--- a/chrome/browser/ui/views/toolbar/reload_button.h
+++ b/chrome/browser/ui/views/toolbar/reload_button.h
@@ -53,7 +53,7 @@ class ReloadButton : public ToolbarButton,
   virtual bool GetTooltipText(const gfx::Point& p,
                               base::string16* tooltip) const OVERRIDE;
   virtual const char* GetClassName() const OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual bool ShouldShowMenu() OVERRIDE;
   virtual void ShowDropDownMenu(ui::MenuSourceType source_type) OVERRIDE;
 
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.cc b/chrome/browser/ui/views/toolbar/toolbar_button.cc
index 2e0e6a4..fb97d1c 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.cc
@@ -8,7 +8,7 @@
 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
 #include "grit/theme_resources.h"
 #include "grit/ui_strings.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/menu_model.h"
 #include "ui/gfx/display.h"
@@ -121,11 +121,11 @@ void ToolbarButton::OnGestureEvent(ui::GestureEvent* event) {
   LabelButton::OnGestureEvent(event);
 }
 
-void ToolbarButton::GetAccessibleState(ui::AccessibleViewState* state) {
+void ToolbarButton::GetAccessibleState(ui::AXViewState* state) {
   CustomButton::GetAccessibleState(state);
-  state->role = ui::AccessibilityTypes::ROLE_BUTTONDROPDOWN;
+  state->role = ui::AX_ROLE_BUTTON_DROP_DOWN;
   state->default_action = l10n_util::GetStringUTF16(IDS_APP_ACCACTION_PRESS);
-  state->state = ui::AccessibilityTypes::STATE_HASPOPUP;
+  state->state = ui::AX_STATE_HASPOPUP;
 }
 
 void ToolbarButton::ShowContextMenuForView(View* source,
diff --git a/chrome/browser/ui/views/toolbar/toolbar_button.h b/chrome/browser/ui/views/toolbar/toolbar_button.h
index 6d346c9..acbbc88 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_button.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_button.h
@@ -44,7 +44,7 @@ class ToolbarButton : public views::LabelButton,
   virtual void OnMouseCaptureLost() OVERRIDE;
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnGestureEvent(ui::GestureEvent* event) OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
 
   // views::ContextMenuController:
   virtual void ShowContextMenuForView(View* source,
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.cc b/chrome/browser/ui/views/toolbar/toolbar_view.cc
index 24bac60..34f5162 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.cc
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.cc
@@ -58,7 +58,7 @@
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/layout.h"
 #include "ui/base/theme_provider.h"
@@ -353,8 +353,8 @@ bool ToolbarView::SetPaneFocus(views::View* initial_focus) {
   return true;
 }
 
-void ToolbarView::GetAccessibleState(ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_TOOLBAR;
+void ToolbarView::GetAccessibleState(ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_TOOLBAR;
   state->name = l10n_util::GetStringUTF16(IDS_ACCNAME_TOOLBAR);
 }
 
diff --git a/chrome/browser/ui/views/toolbar/toolbar_view.h b/chrome/browser/ui/views/toolbar/toolbar_view.h
index 9f76276..647d97f 100644
--- a/chrome/browser/ui/views/toolbar/toolbar_view.h
+++ b/chrome/browser/ui/views/toolbar/toolbar_view.h
@@ -98,7 +98,7 @@ class ToolbarView : public views::AccessiblePaneView,
 
   // Overridden from AccessiblePaneView
   virtual bool SetPaneFocus(View* initial_focus) OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
 
   // Overridden from views::MenuButtonListener:
   virtual void OnMenuButtonClicked(views::View* source,
diff --git a/chrome/browser/ui/views/website_settings/permission_selector_view.cc b/chrome/browser/ui/views/website_settings/permission_selector_view.cc
index cad37e8..8577eb3 100644
--- a/chrome/browser/ui/views/website_settings/permission_selector_view.cc
+++ b/chrome/browser/ui/views/website_settings/permission_selector_view.cc
@@ -7,7 +7,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/ui/website_settings/website_settings_ui.h"
 #include "grit/generated_resources.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/gfx/image/image.h"
@@ -66,7 +66,7 @@ class PermissionMenuButton : public views::MenuButton,
   virtual void SetText(const base::string16& text) OVERRIDE;
 
   // Overridden from views::View.
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
 
  private:
   // Overridden from views::MenuButtonListener.
@@ -120,7 +120,7 @@ void PermissionMenuButton::SetText(const base::string16& text) {
   SizeToPreferredSize();
 }
 
-void PermissionMenuButton::GetAccessibleState(ui::AccessibleViewState* state) {
+void PermissionMenuButton::GetAccessibleState(ui::AXViewState* state) {
   MenuButton::GetAccessibleState(state);
   state->value = text();
 }
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 512cdbb..f4c3199 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -857,6 +857,7 @@
           'type': 'static_library',
           'dependencies': [
             'chrome_resources.gyp:theme_resources',
+            '../ui/accessibility/accessibility.gyp:ax_gen',
             '../skia/skia.gyp:skia',
           ],
           'include_dirs': [
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 60db1da..3a08092 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -47,6 +47,7 @@
         '../third_party/libusb/libusb.gyp:libusb',
         '../third_party/libxml/libxml.gyp:libxml',
         '../third_party/zlib/zlib.gyp:zlib',
+        '../ui/accessibility/accessibility.gyp:accessibility',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
         '../ui/events/events.gyp:events',
         '../ui/gfx/gfx.gyp:gfx',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index e9f4ecf..9d74e21 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -533,6 +533,7 @@
         '../net/net.gyp:net',
         '../third_party/zlib/zlib.gyp:minizip',
         '../third_party/zlib/zlib.gyp:zlib',
+        '../ui/accessibility/accessibility.gyp:ax_gen',
         '../ui/gfx/gfx.gyp:gfx',
         '../ui/gfx/gfx.gyp:gfx_geometry',
         '../ui/ui.gyp:ui',