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

13 files changed, 30 insertions, 31 deletions

diff --git a/ash/system/chromeos/network/tray_network.cc b/ash/system/chromeos/network/tray_network.cc
index 1a15a72..6ce3f2a 100644
--- a/ash/system/chromeos/network/tray_network.cc
+++ b/ash/system/chromeos/network/tray_network.cc
@@ -25,7 +25,7 @@
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "third_party/cros_system_api/dbus/service_constants.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/image_view.h"
@@ -101,9 +101,9 @@ class NetworkTrayView : public TrayItemView,
   }
 
   // views::View override.
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE {
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE {
     state->name = connection_status_string_;
-    state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
+    state->role = ui::AX_ROLE_BUTTON;
   }
 
   // network_icon::AnimationObserver
@@ -123,7 +123,7 @@ class NetworkTrayView : public TrayItemView,
     if (new_connection_status_string != connection_status_string_) {
       connection_status_string_ = new_connection_status_string;
       if(!connection_status_string_.empty())
-        NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true);
+        NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
     }
   }
 
diff --git a/ash/system/chromeos/power/tray_power.cc b/ash/system/chromeos/power/tray_power.cc
index 3ca449f..2b389af 100644
--- a/ash/system/chromeos/power/tray_power.cc
+++ b/ash/system/chromeos/power/tray_power.cc
@@ -21,7 +21,7 @@
 #include "grit/ash_strings.h"
 #include "third_party/icu/source/i18n/unicode/fieldpos.h"
 #include "third_party/icu/source/i18n/unicode/fmtable.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/message_center/message_center.h"
 #include "ui/message_center/notification.h"
@@ -61,9 +61,9 @@ class PowerTrayView : public views::ImageView {
   }
 
   // Overriden from views::View.
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE {
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE {
     state->name = accessible_name_;
-    state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
+    state->role = ui::AX_ROLE_BUTTON;
   }
 
   void UpdateStatus(bool battery_alert) {
@@ -72,7 +72,7 @@ class PowerTrayView : public views::ImageView {
 
     if (battery_alert) {
       accessible_name_ = PowerStatus::Get()->GetAccessibleNameString();
-      NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true);
+      NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
     }
   }
 
@@ -103,7 +103,7 @@ class PowerTrayView : public views::ImageView {
 
     accessible_name_ =  ui::ResourceBundle::GetSharedInstance().
         GetLocalizedString(IDS_CHARGER_REPLACEMENT_ACCESSIBILTY_NOTIFICATION);
-    NotifyAccessibilityEvent(ui::AccessibilityTypes::EVENT_ALERT, true);
+    NotifyAccessibilityEvent(ui::AX_EVENT_ALERT, true);
     ++spring_charger_spoken_notification_count_;
 
     if (spring_charger_spoken_notification_count_ == 1) {
diff --git a/ash/system/chromeos/settings/tray_settings.cc b/ash/system/chromeos/settings/tray_settings.cc
index 432b6aa..34e58d1 100644
--- a/ash/system/chromeos/settings/tray_settings.cc
+++ b/ash/system/chromeos/settings/tray_settings.cc
@@ -16,7 +16,6 @@
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "third_party/skia/include/core/SkColor.h"
-#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/image/image.h"
 #include "ui/views/controls/image_view.h"
diff --git a/ash/system/tray/actionable_view.cc b/ash/system/tray/actionable_view.cc
index 261cefd..6e55325 100644
--- a/ash/system/tray/actionable_view.cc
+++ b/ash/system/tray/actionable_view.cc
@@ -5,7 +5,7 @@
 #include "ash/system/tray/actionable_view.h"
 
 #include "ash/ash_constants.h"
-#include "ui/base/accessibility/accessible_view_state.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/gfx/canvas.h"
 
 namespace ash {
@@ -63,8 +63,8 @@ void ActionableView::SetAccessibleName(const base::string16& name) {
   accessible_name_ = name;
 }
 
-void ActionableView::GetAccessibleState(ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
+void ActionableView::GetAccessibleState(ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_BUTTON;
   state->name = accessible_name_;
 }
 
diff --git a/ash/system/tray/actionable_view.h b/ash/system/tray/actionable_view.h
index f2b3ec1..cef83fe 100644
--- a/ash/system/tray/actionable_view.h
+++ b/ash/system/tray/actionable_view.h
@@ -47,7 +47,7 @@ class ASH_EXPORT ActionableView : public views::View {
   virtual bool OnMousePressed(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseReleased(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseCaptureLost() OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual void OnFocus() OVERRIDE;
   virtual void OnBlur() OVERRIDE;
diff --git a/ash/system/tray/hover_highlight_view.cc b/ash/system/tray/hover_highlight_view.cc
index e5956b9..bc8f017 100644
--- a/ash/system/tray/hover_highlight_view.cc
+++ b/ash/system/tray/hover_highlight_view.cc
@@ -8,7 +8,7 @@
 #include "ash/system/tray/tray_constants.h"
 #include "ash/system/tray/view_click_listener.h"
 #include "grit/ui_resources.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/gfx/canvas.h"
 #include "ui/gfx/font_list.h"
@@ -137,12 +137,12 @@ bool HoverHighlightView::PerformAction(const ui::Event& event) {
   return true;
 }
 
-void HoverHighlightView::GetAccessibleState(ui::AccessibleViewState* state) {
+void HoverHighlightView::GetAccessibleState(ui::AXViewState* state) {
   ActionableView::GetAccessibleState(state);
 
   if (checkable_) {
-    state->role = ui::AccessibilityTypes::ROLE_CHECKBUTTON;
-    state->state = checked_ ? ui::AccessibilityTypes::STATE_CHECKED : 0;
+    state->role = ui::AX_ROLE_CHECK_BOX;
+    state->state = checked_ ? ui::AX_STATE_CHECKED : 0;
   }
 }
 
diff --git a/ash/system/tray/hover_highlight_view.h b/ash/system/tray/hover_highlight_view.h
index e19c3ef..0ca9358f 100644
--- a/ash/system/tray/hover_highlight_view.h
+++ b/ash/system/tray/hover_highlight_view.h
@@ -64,7 +64,7 @@ class HoverHighlightView : public ActionableView {
   virtual bool PerformAction(const ui::Event& event) OVERRIDE;
 
   // Overridden from views::View.
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual int GetHeightForWidth(int width) OVERRIDE;
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
diff --git a/ash/system/tray/system_tray_bubble.cc b/ash/system/tray/system_tray_bubble.cc
index 33b4ba1..3f73ed3 100644
--- a/ash/system/tray/system_tray_bubble.cc
+++ b/ash/system/tray/system_tray_bubble.cc
@@ -267,7 +267,7 @@ void SystemTrayBubble::InitView(views::View* anchor,
 
   if (bubble_view_->CanActivate()) {
     bubble_view_->NotifyAccessibilityEvent(
-        ui::AccessibilityTypes::EVENT_ALERT, true);
+        ui::AX_EVENT_ALERT, true);
   }
 }
 
diff --git a/ash/system/tray/tray_background_view.cc b/ash/system/tray/tray_background_view.cc
index db60ad6..c610ee4 100644
--- a/ash/system/tray/tray_background_view.cc
+++ b/ash/system/tray/tray_background_view.cc
@@ -18,9 +18,9 @@
 #include "ash/system/tray/tray_event_filter.h"
 #include "ash/wm/window_animations.h"
 #include "grit/ash_resources.h"
+#include "ui/accessibility/ax_view_state.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
-#include "ui/base/accessibility/accessible_view_state.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/image/image_skia.h"
@@ -377,8 +377,8 @@ void TrayBackgroundView::ChildPreferredSizeChanged(views::View* child) {
   PreferredSizeChanged();
 }
 
-void TrayBackgroundView::GetAccessibleState(ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
+void TrayBackgroundView::GetAccessibleState(ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_BUTTON;
   state->name = GetAccessibleNameForTray();
 }
 
diff --git a/ash/system/tray/tray_background_view.h b/ash/system/tray/tray_background_view.h
index 14183dd..4addcba 100644
--- a/ash/system/tray/tray_background_view.h
+++ b/ash/system/tray/tray_background_view.h
@@ -70,7 +70,7 @@ class ASH_EXPORT TrayBackgroundView : public ActionableView,
   virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
   virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
   virtual void ChildPreferredSizeChanged(views::View* child) OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
   virtual void AboutToRequestFocusFromTabTraversal(bool reverse) OVERRIDE;
 
   // Overridden from internal::ActionableView.
diff --git a/ash/system/tray/tray_item_more.cc b/ash/system/tray/tray_item_more.cc
index 9284b47..687e697 100644
--- a/ash/system/tray/tray_item_more.cc
+++ b/ash/system/tray/tray_item_more.cc
@@ -8,7 +8,7 @@
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_constants.h"
 #include "grit/ash_resources.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/gfx/image/image.h"
 #include "ui/views/controls/image_view.h"
@@ -98,8 +98,8 @@ void TrayItemMore::Layout() {
   }
 }
 
-void TrayItemMore::GetAccessibleState(ui::AccessibleViewState* state) {
-  state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
+void TrayItemMore::GetAccessibleState(ui::AXViewState* state) {
+  state->role = ui::AX_ROLE_BUTTON;
   state->name = accessible_name_;
 }
 
diff --git a/ash/system/tray/tray_item_more.h b/ash/system/tray/tray_item_more.h
index 4928724..ae668c5 100644
--- a/ash/system/tray/tray_item_more.h
+++ b/ash/system/tray/tray_item_more.h
@@ -45,7 +45,7 @@ class TrayItemMore : public ActionableView {
 
   // Overridden from views::View.
   virtual void Layout() OVERRIDE;
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE;
 
   SystemTrayItem* owner_;
   // True if |more_| should be shown.
diff --git a/ash/system/tray_caps_lock.cc b/ash/system/tray_caps_lock.cc
index ce7b976..933fb95 100644
--- a/ash/system/tray_caps_lock.cc
+++ b/ash/system/tray_caps_lock.cc
@@ -13,7 +13,7 @@
 #include "ash/system/tray/tray_constants.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.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/gfx/image/image.h"
 #include "ui/views/controls/image_view.h"
@@ -88,8 +88,8 @@ class CapsLockDefaultView : public ActionableView {
                                    text_size.height()));
   }
 
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE {
-    state->role = ui::AccessibilityTypes::ROLE_PUSHBUTTON;
+  virtual void GetAccessibleState(ui::AXViewState* state) OVERRIDE {
+    state->role = ui::AX_ROLE_BUTTON;
     state->name = text_label_->text();
   }