12 files changed, 43 insertions, 74 deletions
diff --git a/views/controls/button/button.cc b/views/controls/button/button.cc
index 52d5747..f35b178 100644
--- a/views/controls/button/button.cc
+++ b/views/controls/button/button.cc
@@ -32,17 +32,12 @@ bool Button::GetTooltipText(const gfx::Point& p, std::wstring* tooltip) {
   return true;
 }
 
-bool Button::GetAccessibleKeyboardShortcut(std::wstring* shortcut) {
-  if (!accessible_shortcut_.empty()) {
-    *shortcut = accessible_shortcut_;
-    return true;
-  }
-  return false;
+std::wstring Button::GetAccessibleKeyboardShortcut() {
+  return accessible_shortcut_;
 }
 
-bool Button::GetAccessibleRole(AccessibilityTypes::Role* role) {
-  *role = AccessibilityTypes::ROLE_PUSHBUTTON;
-  return true;
+AccessibilityTypes::Role Button::GetAccessibleRole() {
+  return AccessibilityTypes::ROLE_PUSHBUTTON;
 }
 
 ////////////////////////////////////////////////////////////////////////////////
diff --git a/views/controls/button/button.h b/views/controls/button/button.h
index dfd239c..fe08a19 100644
--- a/views/controls/button/button.h
+++ b/views/controls/button/button.h
@@ -40,8 +40,8 @@ class Button : public View {
 
   // Overridden from View:
   virtual bool GetTooltipText(const gfx::Point& p, std::wstring* tooltip);
-  virtual bool GetAccessibleKeyboardShortcut(std::wstring* shortcut);
-  virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
+  virtual std::wstring GetAccessibleKeyboardShortcut();
+  virtual AccessibilityTypes::Role GetAccessibleRole();
 
  protected:
   // Construct the Button with a Listener. The listener can be NULL. This can be
diff --git a/views/controls/button/button_dropdown.cc b/views/controls/button/button_dropdown.cc
index 7b2b3d0..6fa8dee 100644
--- a/views/controls/button/button_dropdown.cc
+++ b/views/controls/button/button_dropdown.cc
@@ -164,25 +164,16 @@ void ButtonDropDown::ShowDropDownMenu(gfx::NativeView window) {
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-bool ButtonDropDown::GetAccessibleDefaultAction(std::wstring* action) {
-  DCHECK(action);
-
-  action->assign(l10n_util::GetString(IDS_APP_ACCACTION_PRESS));
-  return true;
+std::wstring ButtonDropDown::GetAccessibleDefaultAction() {
+  return l10n_util::GetString(IDS_APP_ACCACTION_PRESS);
 }
 
-bool ButtonDropDown::GetAccessibleRole(AccessibilityTypes::Role* role) {
-  DCHECK(role);
-
-  *role = AccessibilityTypes::ROLE_BUTTONDROPDOWN;
-  return true;
+AccessibilityTypes::Role ButtonDropDown::GetAccessibleRole() {
+  return AccessibilityTypes::ROLE_BUTTONDROPDOWN;
 }
 
-bool ButtonDropDown::GetAccessibleState(AccessibilityTypes::State* state) {
-  DCHECK(state);
-
-  *state = AccessibilityTypes::STATE_HASPOPUP;
-  return true;
+AccessibilityTypes::State ButtonDropDown::GetAccessibleState() {
+  return AccessibilityTypes::STATE_HASPOPUP;
 }
 
 }  // namespace views
diff --git a/views/controls/button/button_dropdown.h b/views/controls/button/button_dropdown.h
index eca97a3..a244f253 100644
--- a/views/controls/button/button_dropdown.h
+++ b/views/controls/button/button_dropdown.h
@@ -26,9 +26,9 @@ class ButtonDropDown : public ImageButton {
   virtual ~ButtonDropDown();
 
   // Accessibility accessors, overridden from View.
-  virtual bool GetAccessibleDefaultAction(std::wstring* action);
-  virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
-  virtual bool GetAccessibleState(AccessibilityTypes::State* state);
+  virtual std::wstring GetAccessibleDefaultAction();
+  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual AccessibilityTypes::State GetAccessibleState();
 
  private:
   // Overridden from CustomButton
diff --git a/views/controls/button/checkbox.cc b/views/controls/button/checkbox.cc
index 404a0ea..bae0fcc 100644
--- a/views/controls/button/checkbox.cc
+++ b/views/controls/button/checkbox.cc
@@ -167,18 +167,12 @@ void Checkbox::WillLoseFocus() {
   label_->set_paint_as_focused(false);
 }
 
-bool Checkbox::GetAccessibleRole(AccessibilityTypes::Role* role) {
-  DCHECK(role);
-
-  *role = AccessibilityTypes::ROLE_CHECKBUTTON;
-  return true;
+AccessibilityTypes::Role Checkbox::GetAccessibleRole() {
+  return AccessibilityTypes::ROLE_CHECKBUTTON;
 }
 
-bool Checkbox::GetAccessibleState(AccessibilityTypes::State* state) {
-  DCHECK(state);
-
-  *state = checked() ? AccessibilityTypes::STATE_CHECKED : 0;
-  return true;
+AccessibilityTypes::State Checkbox::GetAccessibleState() {
+  return checked() ? AccessibilityTypes::STATE_CHECKED : 0;
 }
 
 std::string Checkbox::GetClassName() const {
diff --git a/views/controls/button/checkbox.h b/views/controls/button/checkbox.h
index 87ffe04..7e01afa 100644
--- a/views/controls/button/checkbox.h
+++ b/views/controls/button/checkbox.h
@@ -60,8 +60,8 @@ class Checkbox : public NativeButton {
   virtual void WillLoseFocus();
 
   // Accessibility accessors, overridden from View.
-  virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
-  virtual bool GetAccessibleState(AccessibilityTypes::State* state);
+  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual AccessibilityTypes::State GetAccessibleState();
 
   // Overridden from NativeButton:
   virtual void SetLabel(const std::wstring& label);
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) {
diff --git a/views/controls/button/custom_button.h b/views/controls/button/custom_button.h
index 4d7dff7..f5a1b85 100644
--- a/views/controls/button/custom_button.h
+++ b/views/controls/button/custom_button.h
@@ -43,7 +43,7 @@ class CustomButton : public Button,
   void SetAnimationDuration(int duration);
 
   // Overridden from View:
-  virtual bool GetAccessibleState(AccessibilityTypes::State* state);
+  virtual AccessibilityTypes::State GetAccessibleState();
   virtual void SetEnabled(bool enabled);
   virtual bool IsEnabled() const;
   virtual bool IsFocusable() const;
diff --git a/views/controls/button/menu_button.cc b/views/controls/button/menu_button.cc
index 4973ea2..e7f7f1b 100644
--- a/views/controls/button/menu_button.cc
+++ b/views/controls/button/menu_button.cc
@@ -255,25 +255,16 @@ void MenuButton::OnMouseExited(const MouseEvent& event) {
 //
 ////////////////////////////////////////////////////////////////////////////////
 
-bool MenuButton::GetAccessibleDefaultAction(std::wstring* action) {
-  DCHECK(action);
-
-  action->assign(l10n_util::GetString(IDS_APP_ACCACTION_PRESS));
-  return true;
+std::wstring MenuButton::GetAccessibleDefaultAction() {
+  return l10n_util::GetString(IDS_APP_ACCACTION_PRESS);
 }
 
-bool MenuButton::GetAccessibleRole(AccessibilityTypes::Role* role) {
-  DCHECK(role);
-
-  *role = AccessibilityTypes::ROLE_BUTTONMENU;
-  return true;
+AccessibilityTypes::Role MenuButton::GetAccessibleRole() {
+  return AccessibilityTypes::ROLE_BUTTONMENU;
 }
 
-bool MenuButton::GetAccessibleState(AccessibilityTypes::State* state) {
-  DCHECK(state);
-
-  *state = AccessibilityTypes::STATE_HASPOPUP;
-  return true;
+AccessibilityTypes::State MenuButton::GetAccessibleState() {
+  return AccessibilityTypes::STATE_HASPOPUP;
 }
 
 std::string MenuButton::GetClassName() const {
diff --git a/views/controls/button/menu_button.h b/views/controls/button/menu_button.h
index ac20b0f..72f8fb6 100644
--- a/views/controls/button/menu_button.h
+++ b/views/controls/button/menu_button.h
@@ -59,9 +59,9 @@ class MenuButton : public TextButton {
   virtual bool OnKeyReleased(const KeyEvent& e);
 
   // Accessibility accessors, overridden from View.
-  virtual bool GetAccessibleDefaultAction(std::wstring* action);
-  virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
-  virtual bool GetAccessibleState(AccessibilityTypes::State* state);
+  virtual std::wstring GetAccessibleDefaultAction();
+  virtual AccessibilityTypes::Role GetAccessibleRole();
+  virtual AccessibilityTypes::State GetAccessibleState();
 
   // Returns views/MenuButton.
   virtual std::string GetClassName() const;
diff --git a/views/controls/button/radio_button.cc b/views/controls/button/radio_button.cc
index d7953e1..b189aa6 100644
--- a/views/controls/button/radio_button.cc
+++ b/views/controls/button/radio_button.cc
@@ -1,6 +1,6 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved. Use of this
-// source code is governed by a BSD-style license that can be found in the
-// LICENSE file.
+// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
 
 #include "views/controls/button/radio_button.h"
 
@@ -60,9 +60,8 @@ void RadioButton::SetChecked(bool checked) {
 ////////////////////////////////////////////////////////////////////////////////
 // RadioButton, View overrides:
 
-bool RadioButton::GetAccessibleRole(AccessibilityTypes::Role* role) {
-  *role = AccessibilityTypes::ROLE_RADIOBUTTON;
-  return true;
+AccessibilityTypes::Role RadioButton::GetAccessibleRole() {
+  return AccessibilityTypes::ROLE_RADIOBUTTON;
 }
 
 View* RadioButton::GetSelectedViewForGroup(int group_id) {
diff --git a/views/controls/button/radio_button.h b/views/controls/button/radio_button.h
index af7f902..7ea35f5 100644
--- a/views/controls/button/radio_button.h
+++ b/views/controls/button/radio_button.h
@@ -25,7 +25,7 @@ class RadioButton : public Checkbox {
   virtual void SetChecked(bool checked);
 
   // Overridden from View:
-  virtual bool GetAccessibleRole(AccessibilityTypes::Role* role);
+  virtual AccessibilityTypes::Role GetAccessibleRole();
   virtual View* GetSelectedViewForGroup(int group_id);
   virtual bool IsGroupFocusTraversable() const;
   virtual void OnMouseReleased(const MouseEvent& event, bool canceled);