diff options
| author | ctguil@chromium.org <ctguil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-28 19:30:23 +0000 |
|---|---|---|
| committer | ctguil@chromium.org <ctguil@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-09-28 19:30:23 +0000 |
| commit | 4c671e16908c0f60f38aa26051b89d399b5eb0f0 (patch) | |
| tree | 36801dcd79034457409f700a0bf42d0f1304c8e1 /views/controls/button/custom_button.cc | |
| parent | 485149b279565e436b1c2a6157086b81b4e9ede7 (diff) | |
| download | chromium_src-4c671e16908c0f60f38aa26051b89d399b5eb0f0.zip chromium_src-4c671e16908c0f60f38aa26051b89d399b5eb0f0.tar.gz chromium_src-4c671e16908c0f60f38aa26051b89d399b5eb0f0.tar.bz2 | |
Make accessible getters return values instead of accepting an output parameter. GetAccessibleName still needs to be converted.
BUG=none
TEST=trybots
Review URL: http://codereview.chromium.org/3416033
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@60828 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/controls/button/custom_button.cc')
| -rw-r--r-- | views/controls/button/custom_button.cc | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/views/controls/button/custom_button.cc b/views/controls/button/custom_button.cc index bc949c1..4ab2fae 100644 --- a/views/controls/button/custom_button.cc +++ b/views/controls/button/custom_button.cc @@ -53,22 +53,21 @@ void CustomButton::SetAnimationDuration(int duration) { //////////////////////////////////////////////////////////////////////////////// // CustomButton, View overrides: -bool CustomButton::GetAccessibleState(AccessibilityTypes::State* state) { - *state = 0; +AccessibilityTypes::State CustomButton::GetAccessibleState() { + int state = 0; switch (state_) { case BS_HOT: - *state = AccessibilityTypes::STATE_HOTTRACKED; + state = AccessibilityTypes::STATE_HOTTRACKED; case BS_PUSHED: - *state = AccessibilityTypes::STATE_PRESSED; + state = AccessibilityTypes::STATE_PRESSED; case BS_DISABLED: - *state = AccessibilityTypes::STATE_UNAVAILABLE; + state = AccessibilityTypes::STATE_UNAVAILABLE; case BS_NORMAL: case BS_COUNT: // No additional accessibility state set for this button state. break; } - - return true; + return state; } void CustomButton::SetEnabled(bool enabled) { |