diff options
| author | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 00:39:07 +0000 |
|---|---|---|
| committer | jcivelli@chromium.org <jcivelli@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-03-04 00:39:07 +0000 |
| commit | bb837f9287259862c94155cc59cfc9e1bdfe1258 (patch) | |
| tree | f23a7dabe56a4b4c9288ea022f65c090a4fc536b /views/controls/scrollbar | |
| parent | d19e63d5bd3a61fc46bae0c527731c79abb94957 (diff) | |
| download | chromium_src-bb837f9287259862c94155cc59cfc9e1bdfe1258.zip chromium_src-bb837f9287259862c94155cc59cfc9e1bdfe1258.tar.gz chromium_src-bb837f9287259862c94155cc59cfc9e1bdfe1258.tar.bz2 | |
Revert 76825 - Refactor Views accessibility.
BUG=none
TEST=none
Review URL: http://codereview.chromium.org/6581010
TBR=dmazzoni@chromium.org
Review URL: http://codereview.chromium.org/6612035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76844 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/scrollbar')
| -rw-r--r-- | views/controls/scrollbar/scroll_bar.cc | 5 | ||||
| -rw-r--r-- | views/controls/scrollbar/scroll_bar.h | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/views/controls/scrollbar/scroll_bar.cc b/views/controls/scrollbar/scroll_bar.cc index 880a42a..94360bb 100644 --- a/views/controls/scrollbar/scroll_bar.cc +++ b/views/controls/scrollbar/scroll_bar.cc @@ -5,7 +5,6 @@ #include "views/controls/scrollbar/scroll_bar.h" #include "base/logging.h" -#include "ui/base/accessibility/accessible_view_state.h" namespace views { @@ -23,8 +22,8 @@ ScrollBar::ScrollBar(bool is_horiz) : is_horiz_(is_horiz), ScrollBar::~ScrollBar() { } -void ScrollBar::GetAccessibleState(ui::AccessibleViewState* state) { - state->role = ui::AccessibilityTypes::ROLE_SCROLLBAR; +AccessibilityTypes::Role ScrollBar::GetAccessibleRole() { + return AccessibilityTypes::ROLE_SCROLLBAR; } bool ScrollBar::IsHorizontal() const { diff --git a/views/controls/scrollbar/scroll_bar.h b/views/controls/scrollbar/scroll_bar.h index d7f187b..faed881 100644 --- a/views/controls/scrollbar/scroll_bar.h +++ b/views/controls/scrollbar/scroll_bar.h @@ -60,7 +60,7 @@ class ScrollBar : public View { virtual ~ScrollBar(); // Overridden from View: - virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE; + virtual AccessibilityTypes::Role GetAccessibleRole(); // Return whether this scrollbar is horizontal bool IsHorizontal() const; |