AX checked state changes

ash/common/system/tray/hover_highlight_view.cc

 // Copyright 2012 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 "ash/common/system/tray/hover_highlight_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/fixed_sized_image_view.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_utils.h"
@@ skipping 304 matching lines @@
 bool HoverHighlightView::PerformAction(const ui::Event& event) {
   if (!listener_)
     return false;
   listener_->OnViewClicked(this);
   return true;
 }
 
 void HoverHighlightView::GetAccessibleNodeData(ui::AXNodeData* node_data) {
   ActionableView::GetAccessibleNodeData(node_data);
 
-  if (accessibility_state_ == AccessibilityState::CHECKED_CHECKBOX ||
-      accessibility_state_ == AccessibilityState::UNCHECKED_CHECKBOX) {
-    node_data->role = ui::AX_ROLE_CHECK_BOX;
-  }
+  ui::AXCheckedState checked_state;
+  if (accessibility_state_ == AccessibilityState::CHECKED_CHECKBOX)
+    checked_state = ui::AX_CHECKED_STATE_TRUE;
+  else if (accessibility_state_ == AccessibilityState::UNCHECKED_CHECKBOX)
+    checked_state = ui::AX_CHECKED_STATE_FALSE;
+  else
+    return;  // Not a checkbox
 
-  if (accessibility_state_ == AccessibilityState::CHECKED_CHECKBOX)
-    node_data->AddStateFlag(ui::AX_STATE_CHECKED);
+  // Checkbox
+  node_data->role = ui::AX_ROLE_CHECK_BOX;
+  node_data->AddIntAttribute(ui::AX_ATTR_CHECKED_STATE, checked_state);
 }
 
 gfx::Size HoverHighlightView::GetPreferredSize() const {
   gfx::Size size = ActionableView::GetPreferredSize();
 
   if (custom_height_)
     size.set_height(custom_height_);
   else if (!expandable_ || size.height() < kTrayPopupItemMinHeight)
     size.set_height(kTrayPopupItemMinHeight);
 
@@ skipping 45 matching lines @@
 void HoverHighlightView::OnPaintBackground(gfx::Canvas* canvas) {
   canvas->DrawColor(hover_ ? highlight_color_ : default_color_);
 }
 
 void HoverHighlightView::OnFocus() {
   ScrollRectToVisible(gfx::Rect(gfx::Point(), size()));
   ActionableView::OnFocus();
 }
 
 }  // namespace ash