diff options
| author | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-25 18:28:13 +0000 |
|---|---|---|
| committer | dmazzoni@chromium.org <dmazzoni@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-25 18:28:13 +0000 |
| commit | 739c8bcdcc6a3722fb6769e3fc2f335d67b789ff (patch) | |
| tree | bc7c395370a9ee7fdfcc84c0525a592fd841e496 /ash/system/chromeos | |
| parent | bf26d227ea2ba3092bbe7a23853669c7f6108881 (diff) | |
| download | chromium_src-739c8bcdcc6a3722fb6769e3fc2f335d67b789ff.zip chromium_src-739c8bcdcc6a3722fb6769e3fc2f335d67b789ff.tar.gz chromium_src-739c8bcdcc6a3722fb6769e3fc2f335d67b789ff.tar.bz2 | |
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
Diffstat (limited to 'ash/system/chromeos')
| -rw-r--r-- | ash/system/chromeos/network/tray_network.cc | 8 | ||||
| -rw-r--r-- | ash/system/chromeos/power/tray_power.cc | 10 | ||||
| -rw-r--r-- | ash/system/chromeos/settings/tray_settings.cc | 1 |
3 files changed, 9 insertions, 10 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" |