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/label.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/label.cc')
| -rw-r--r-- | views/controls/label.cc | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/views/controls/label.cc b/views/controls/label.cc index 8325cfa..0a9beac 100644 --- a/views/controls/label.cc +++ b/views/controls/label.cc @@ -247,18 +247,12 @@ void Label::SizeToFit(int max_width) { SizeToPreferredSize(); } -bool Label::GetAccessibleRole(AccessibilityTypes::Role* role) { - DCHECK(role); - - *role = AccessibilityTypes::ROLE_STATICTEXT; - return true; +AccessibilityTypes::Role Label::GetAccessibleRole() { + return AccessibilityTypes::ROLE_STATICTEXT; } -bool Label::GetAccessibleState(AccessibilityTypes::State* state) { - DCHECK(state); - - *state = AccessibilityTypes::STATE_READONLY; - return true; +AccessibilityTypes::State Label::GetAccessibleState() { + return AccessibilityTypes::STATE_READONLY; } void Label::SetHasFocusBorder(bool has_focus_border) { |